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 diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index 99d75abb..bb37c915 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -24,6 +24,10 @@ services: # - --bootstraps=/dns/nox-1/tcp/7771 # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq + - --enable-system-services=none + - --management-key=12D3KooWGLAmtTkqZqqKiSxXpb2j1SRjpbE2YgZZb4Unzn5VPj9p + - --dev-mode networks: nox: ipv4_address: 10.50.10.10 + 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: | [ { 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 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 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 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