From b614eb6111d1a27ffce736017c0e0a175208a4ba Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 12:55:07 +0300 Subject: [PATCH 1/7] Fix CI envs for system tests. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f68fa16aa..7fc1d37f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -265,6 +265,8 @@ jobs: DB_TYPE: 'elasticsearch' MAX_REQ_PER_MINUTE: 320 MAX_CONNECTIONS_PER_MINUTE: 320 + ADDRESS_FILE: '/ocean-contracts/artifacts/address.json' + DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":1000000000}],"storageExpiry":604800,"maxJobDuration":3600,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1000000000},{"id":"disk","max":1000000000}]}}]' - name: Check Ocean Node is running run: | for i in $(seq 1 90); do From c3f912c2d83457f8d64f496e16e467fe684c222d Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 13:11:30 +0300 Subject: [PATCH 2/7] Update addresses env. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fc1d37f2..11aea407f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -265,7 +265,7 @@ jobs: DB_TYPE: 'elasticsearch' MAX_REQ_PER_MINUTE: 320 MAX_CONNECTIONS_PER_MINUTE: 320 - ADDRESS_FILE: '/ocean-contracts/artifacts/address.json' + ADDRESS_FILE: '${HOME}/.ocean/ocean-contracts/artifacts/address.json' DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":1000000000}],"storageExpiry":604800,"maxJobDuration":3600,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1000000000},{"id":"disk","max":1000000000}]}}]' - name: Check Ocean Node is running run: | From 516c56b8d6b6fc48db89f33328ab5970f2268420 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 13:24:48 +0300 Subject: [PATCH 3/7] Remove address file env. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11aea407f..e877f080e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -265,7 +265,6 @@ jobs: DB_TYPE: 'elasticsearch' MAX_REQ_PER_MINUTE: 320 MAX_CONNECTIONS_PER_MINUTE: 320 - ADDRESS_FILE: '${HOME}/.ocean/ocean-contracts/artifacts/address.json' DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":1000000000}],"storageExpiry":604800,"maxJobDuration":3600,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1000000000},{"id":"disk","max":1000000000}]}}]' - name: Check Ocean Node is running run: | From e92d1af9f75ae69c90605f5bca2961f0f77e968a Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 14:34:24 +0300 Subject: [PATCH 4/7] use this branch of cli. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e877f080e..1ada726d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,7 @@ jobs: with: repository: 'oceanprotocol/ocean-cli' path: 'ocean-cli' - ref: 'main' + ref: 'fix-tests-for-node' - name: Setup Ocean CLI working-directory: ${{ github.workspace }}/ocean-cli run: | From c9f860a06fa711ba61de85bbe20534f9aaf5b07a Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 15:40:55 +0300 Subject: [PATCH 5/7] use cli main branch. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ada726d2..e877f080e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,7 @@ jobs: with: repository: 'oceanprotocol/ocean-cli' path: 'ocean-cli' - ref: 'fix-tests-for-node' + ref: 'main' - name: Setup Ocean CLI working-directory: ${{ github.workspace }}/ocean-cli run: | From b8eec507d648ac243ae8da1581403e6e8b9e13f7 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 16:06:49 +0300 Subject: [PATCH 6/7] Fix cli branch. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e877f080e..1ada726d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,7 @@ jobs: with: repository: 'oceanprotocol/ocean-cli' path: 'ocean-cli' - ref: 'main' + ref: 'fix-tests-for-node' - name: Setup Ocean CLI working-directory: ${{ github.workspace }}/ocean-cli run: | From 63d311d2b64e191ea2fced906a9e6916319d70c1 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 16:19:33 +0300 Subject: [PATCH 7/7] replace branch. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ada726d2..e877f080e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,7 @@ jobs: with: repository: 'oceanprotocol/ocean-cli' path: 'ocean-cli' - ref: 'fix-tests-for-node' + ref: 'main' - name: Setup Ocean CLI working-directory: ${{ github.workspace }}/ocean-cli run: |