git.delta.rocks / unique-network / refs/commits / 8b182833d5e8

difftreelog

zombienet tests

Konstantin Astakhov2023-05-03parent: #df8c9ac.patch.diff
in: master

3 files changed

modified.docker/Dockerfile-parachain-upgrade-data.j2diffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data.j2
+++ b/.docker/Dockerfile-parachain-upgrade-data.j2
@@ -40,6 +40,7 @@
 # ===== RUN ======
 FROM ubuntu:22.04
 
+ENV RELAY_CHAIN_TYPE={{ RELAY_CHAIN_TYPE }}
 ENV REPLICA_FROM={{ REPLICA_FROM }}
 ENV NEW_PARA_BIN=/unique-chain/target/release/unique-collator
 ENV NEW_PARA_WASM=/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm
@@ -68,7 +69,7 @@
 COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
 COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/rococo-runtime/rococo_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/rococo-runtime/rococo_runtime.compact.compressed.wasm
 
-CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM && \
+CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM RELAY_CHAIN_TYPE && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /unique-chain/tests && \
     npm install --global yarn && \
added.docker/forkless-config/zombienet-forkless-data.tomldiffbeforeafterboth
after · .docker/forkless-config/zombienet-forkless-data.toml
1[settings]2provider = "native"34[relaychain]5default_command = "/polkadot/target/release/polkadot"6default_args = [ "-lparachain::candidate_validation=debug", "-lxcm=trace", ]7chain = "{{ RELAY_CHAIN_TYPE }}-local"89  [[relaychain.nodes]]10  name = "relay-alice"11  ws_port = 984412  rpc_port = 984313  p2p_port = 304441415  [[relaychain.node_groups]]16  name = "relay"17  count = 41819[[parachains]]20id = 100021chain_spec_modifier_commands = [[22  "chainql",23  "--tla-code=rawSpec=import '{{'raw'|chainSpec}}'",24  "--tla-str=forkFrom={{ REPLICA_FROM }}",25  "fork.jsonnet",26]]2728  [[parachains.collators]]29  name = "alice"30  command = "/unique-chain/current/release/unique-collator"31  ws_port = 994432  rpc_port = 993333  p2p_port = 3120034  args = [35    "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",36  ]3738  [[parachains.collators]]39  name = "bob"40  command = "/unique-chain/current/release/unique-collator"41  ws_port = 994542  rpc_port = 993443  p2p_port = 3120144  args = [45    "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",46  ]
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -90,17 +90,17 @@
       - name: Show build configuration
         run: cat .docker/Dockerfile-parachain-upgrade-data.${{ matrix.network }}.yml
 
-      - name: Generate zombienet-forkless-data.toml
-        uses: cuchi/jinja2-action@v1.2.0
-        with:
-          template: .docker/forkless-config/zombienet-forkless-data.j2
-          output_file: .docker/forkless-config/zombienet-forkless-data.toml
-          variables: |
-            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
-            REPLICA_FROM=${{ matrix.replica_from_address }}            
+      # - name: Generate zombienet-forkless-data.toml
+      #   uses: cuchi/jinja2-action@v1.2.0
+      #   with:
+      #     template: .docker/forkless-config/zombienet-forkless-data.j2
+      #     output_file: .docker/forkless-config/zombienet-forkless-data.toml
+      #     variables: |
+      #       RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
+      #       REPLICA_FROM=${{ matrix.replica_from_address }}            
 
-      - name: Show zombienet-forkless-data configuration
-        run: cat .docker/forkless-config/zombienet-forkless-data.toml
+      # - name: Show zombienet-forkless-data configuration
+      #   run: cat .docker/forkless-config/zombienet-forkless-data.toml
 
       - name: Run find-and-replace to remove slashes from branch name
         uses: mad9000/actions-find-and-replace-string@4