From 5594a168842b290b7f98eaf1f860b757429dfc11 Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Wed, 17 Jul 2024 16:59:31 +0200 Subject: [PATCH 1/8] fix: print logs on a service --- src/aqua/installation-spell/src/aqua/spell.aqua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/aqua/installation-spell/src/aqua/spell.aqua b/src/aqua/installation-spell/src/aqua/spell.aqua index 750702c0..87e5ea83 100644 --- a/src/aqua/installation-spell/src/aqua/spell.aqua +++ b/src/aqua/installation-spell/src/aqua/spell.aqua @@ -161,11 +161,11 @@ func download_service(s: Service, ipfs: Multiaddr) -> []Hash: for m <- s.modules: get_wasm <- get_from(HOST_PEER_ID, m.wasm, ipfs) if get_wasm.success: - on HOST_PEER_ID: - try: + try: + on HOST_PEER_ID: hashes <<- Dist.add_module_bytes_from_vault(m.name, get_wasm.path) - catch e: - log([s.name, "error adding module", m.name, e]) + catch e: + log([s.name, "error adding module", m.name, e]) else: log([s.name, "error retrieving module", m.name, ["wasm", m.wasm, get_wasm]]) <- hashes From b4e2671229f03100a99b3a84845f9c2cc115ad82 Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Thu, 18 Jul 2024 17:00:57 +0200 Subject: [PATCH 2/8] fix workflow --- .github/workflows/release.yml | 4 ++-- .github/workflows/run-tests.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a6f2f5b..e1d4bcc0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: working-directory: ./src/spell/modules/spell/spell run: ./build.sh - - uses: pnpm/action-setup@v2.2.4 + - uses: pnpm/action-setup@v2.4.1 with: version: 8 @@ -167,7 +167,7 @@ jobs: --skip-published \ --yes - - uses: pnpm/action-setup@v2.2.4 + - uses: pnpm/action-setup@v2.4.1 with: version: 8 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 826ff3dc..687c92bd 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -33,7 +33,7 @@ jobs: ref: ${{ github.ref }} - name: Setup pnpm - uses: pnpm/action-setup@v2.2.4 + uses: pnpm/action-setup@v2.4.1 with: version: 8 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 64807e9d..103430ee 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -102,7 +102,7 @@ jobs: path: src/spell/modules/spell - name: Setup pnpm - uses: pnpm/action-setup@v2.2.4 + uses: pnpm/action-setup@v2.4.1 with: version: 8 From 96f56449232b6a5ed5fe12f2e946c2d85cc048af Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Mon, 22 Jul 2024 11:34:21 +0200 Subject: [PATCH 3/8] remove branch ref --- .github/workflows/e2e.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index edf489e1..f5723218 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -55,7 +55,6 @@ jobs: - snapshot uses: fluencelabs/nox/.github/workflows/build.yml@master with: - ref: restrict-effectors cargo-dependencies: | [ { @@ -93,7 +92,6 @@ jobs: uses: fluencelabs/nox/.github/workflows/tests.yml@master with: - ref: restrict-effectors cargo-dependencies: | [ { From dec7866d757a755b228440cb2866b6ec4da4a1a1 Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Mon, 22 Jul 2024 12:37:31 +0200 Subject: [PATCH 4/8] disable system services in e2e --- .github/e2e/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index 99d75abb..eccee93b 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -24,6 +24,7 @@ services: # - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq + - --enable-system-services=none networks: nox: ipv4_address: 10.50.10.10 From 0a94b5d4c9f84937ab011065c37a31a75f783bfd Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Mon, 22 Jul 2024 14:24:23 +0200 Subject: [PATCH 5/8] run e2e nox in dev-mode --- .github/e2e/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index eccee93b..c8bd4f94 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -25,6 +25,7 @@ services: # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq - --enable-system-services=none + - --dev-mode networks: nox: ipv4_address: 10.50.10.10 From 37ef23bf0b53f7a065c402b8c548e6e0e4216daf Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Wed, 31 Jul 2024 10:43:48 +0200 Subject: [PATCH 6/8] try to fix CI --- .github/e2e/docker-compose.yml | 1 + integration-tests/framework.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index c8bd4f94..4d0f1c61 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -25,6 +25,7 @@ services: # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq - --enable-system-services=none + - --management-key=12D3KooWGLAmtTkqZqqKiSxXpb2j1SRjpbE2YgZZb4Unzn5VPj9p - --dev-mode networks: nox: diff --git a/integration-tests/framework.py b/integration-tests/framework.py index fdf048f1..caf03d8b 100644 --- a/integration-tests/framework.py +++ b/integration-tests/framework.py @@ -19,6 +19,7 @@ def make_key(): return name + def delete_key(name): with key_lock: c = delegator.run(f"fluence key remove {name} --no-input", block=True) @@ -26,6 +27,9 @@ def delete_key(name): print(c.err) return name +def get_key(): + return 'integration-tests-key' + def get_relays(): env = os.environ.get("FLUENCE_ENV") @@ -228,7 +232,7 @@ def init_param_opt(param_name): old_setup_class = getattr(cls, "setup_class", None) def setup_class(cls): - key_pair_name = make_key() + key_pair_name = get_key() spell_id = create_spell(key_pair_name, air_script, config, dat, alias) cls.spell_id = spell_id cls.key_pair_name = key_pair_name @@ -245,7 +249,7 @@ def teardown_class(cls): if old_teardown_class is not None: old_teardown_class() destroy_spell(cls.key_pair_name, cls.spell_id) - delete_key(cls.key_pair_name) + #delete_key(cls.key_pair_name) cls.teardown_class = teardown_class From ff0d46945bfe4d6304c5fffc065763e01c141664 Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Wed, 31 Jul 2024 11:59:13 +0200 Subject: [PATCH 7/8] try to trigger ci --- .github/e2e/docker-compose.yml | 1 + README | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index 4d0f1c61..bb37c915 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -30,3 +30,4 @@ services: networks: nox: ipv4_address: 10.50.10.10 + diff --git a/README b/README index b48e173c..9a94b2d1 100644 --- a/README +++ b/README @@ -1 +1 @@ -# Spell \ No newline at end of file +# Spell Repo From 7055716449fcd58956dfd41317f500a71581c1ec Mon Sep 17 00:00:00 2001 From: Maria Kuklina Date: Wed, 31 Jul 2024 16:30:13 +0200 Subject: [PATCH 8/8] add secret key for tests --- .fluence/secrets/integration-tests-key.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .fluence/secrets/integration-tests-key.txt diff --git a/.fluence/secrets/integration-tests-key.txt b/.fluence/secrets/integration-tests-key.txt new file mode 100644 index 00000000..0f06db2f --- /dev/null +++ b/.fluence/secrets/integration-tests-key.txt @@ -0,0 +1 @@ +3DqrJbuj/H4cRdu0zq5eXdjcqwBJ3OgmUr7Htr3WiBw= \ No newline at end of file