Merge remote-tracking branch 'origin/beta' into bugfix/JST-1047/memor…

…y-leak
golemfactory · Sep 3, 2024 · be83305 · be83305
2 parents 6d26fa9 + 9fe76e7
commit be83305
Show file tree

Hide file tree

Showing 21 changed files with 368 additions and 189 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,6 +34,10 @@ on:
         description: "Provider VM version (e.g., v0.3.0)"
         required: false
         default: "v0.3.0"
+      log_level:
+        description: "The log level to force on golem-js pino-logger"
+        required: false
+        default: "info"
 
 # We're going to interact with GH from the pipelines, so we need to get some permissions
 permissions:
@@ -45,6 +49,7 @@ env:
   PROVIDER_WASI_VERSION: ${{ github.event.inputs.provider_wasi_version || 'v0.2.2' }}
   PROVIDER_VM_VERSION: ${{ github.event.inputs.provider_vm_version || 'v0.3.0' }}
   PAYMENT_NETWORK: ${{ github.event.inputs.payment_network || 'holesky' }}
+  GOLEM_PINO_LOG_LEVEL: ${{ github.event.inputs.log_level || 'info' }}
 
 jobs:
   regular-checks:
@@ -122,7 +127,7 @@ jobs:
         uses: ./.github/actions/prepare-tests
 
       - name: Run the Examples tests
-        run: docker exec -t docker-requestor-1 /bin/sh -c "cd /golem-js && npm run test:examples -- --exitOnError"
+        run: docker exec -t -e GOLEM_PINO_LOG_LEVEL="${{ env.GOLEM_PINO_LOG_LEVEL }}" docker-requestor-1 /bin/sh -c "cd /golem-js && npm run test:examples -- --exitOnError"
 
       - name: Cleanup test environment
         uses: ./.github/actions/cleanup-tests

diff --git a/examples/core-api/scan.ts b/examples/core-api/scan.ts
@@ -8,7 +8,9 @@ import { last, map, scan, takeUntil, tap, timer } from "rxjs";
 const scanOptions: ScanOptions = {
   // fairly powerful machine but not too powerful
   workload: {
-    engine: "vm",
+    runtime: {
+      name: "vm",
+    },
     minCpuCores: 4,
     maxCpuCores: 16,
     minMemGib: 4,

diff --git a/examples/experimental/deployment/new-api.ts b/examples/experimental/deployment/new-api.ts
@@ -22,6 +22,7 @@ async function main() {
         demand: {
           workload: {
             imageTag: "golem/node:latest",
+            capabilities: ["vpn"],
           },
         },
         market: {

diff --git a/examples/rental-model/basic/vpn.ts b/examples/rental-model/basic/vpn.ts
@@ -13,7 +13,10 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
     const network = await glm.createNetwork({ ip: "192.168.7.0/24" });
     const order: MarketOrderSpec = {
       demand: {
-        workload: { imageTag: "golem/alpine:latest" },
+        workload: {
+          imageTag: "golem/alpine:latest",
+          capabilities: ["vpn"],
+        },
       },
       market: {
         rentHours: 0.5,