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
before · .docker/Dockerfile-parachain-upgrade-data.j2
1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot23# ===== Rust builder =====4FROM uniquenetwork/services:latest as rust-builder56ENV CARGO_HOME="/cargo-home"7ENV PATH="/cargo-home/bin:$PATH"8ENV TZ=UTC910RUN rustup toolchain uninstall $(rustup toolchain list) && \11    rustup toolchain install {{ RUST_TOOLCHAIN }} && \12    rustup default {{ RUST_TOOLCHAIN }} && \13    rustup target list --installed && \14    rustup show15RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1617RUN mkdir /unique_parachain18WORKDIR /unique_parachain1920# ===== BUILD current version ======21FROM rust-builder as builder-unique-current2223ARG PROFILE=release2425WORKDIR /unique_parachain2627RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b {{ MAINNET_BRANCH }} . && \28   cargo build --features={{ NETWORK }}-runtime --$PROFILE2930# ===== BUILD target version ======31FROM rust-builder as builder-unique-target3233ARG PROFILE=release3435COPY . /unique_parachain36WORKDIR /unique_parachain3738RUN cargo build --features={{ NETWORK }}-runtime{{ EXTRA_FEATURES }} --$PROFILE3940# ===== RUN ======41FROM ubuntu:22.044243ENV REPLICA_FROM={{ REPLICA_FROM }}44ENV NEW_PARA_BIN=/unique-chain/target/release/unique-collator45ENV NEW_PARA_WASM=/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm4647RUN apt-get -y update && \48    apt-get -y install curl git && \49    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \50    export NVM_DIR="$HOME/.nvm" && \51    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \52    nvm install v16.16.0 && \53    nvm use v16.16.05455RUN env5657COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/58COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/59COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm6061COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/zombienet-forkless-data.toml /unique-chain/tests/zombienet-forkless.toml62COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /unique-chain/tests/fork.jsonnet63COPY --from=builder-unique-target /unique_parachain/tests/ /unique-chain/tests/6465COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/6667COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/68COPY --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.wasm69COPY --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.wasm7071CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    cd /unique-chain/tests && \74    npm install --global yarn && \75    yarn install && \76    yarn frankenstein zombienet-forkless.toml
after · .docker/Dockerfile-parachain-upgrade-data.j2
1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot23# ===== Rust builder =====4FROM uniquenetwork/services:latest as rust-builder56ENV CARGO_HOME="/cargo-home"7ENV PATH="/cargo-home/bin:$PATH"8ENV TZ=UTC910RUN rustup toolchain uninstall $(rustup toolchain list) && \11    rustup toolchain install {{ RUST_TOOLCHAIN }} && \12    rustup default {{ RUST_TOOLCHAIN }} && \13    rustup target list --installed && \14    rustup show15RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1617RUN mkdir /unique_parachain18WORKDIR /unique_parachain1920# ===== BUILD current version ======21FROM rust-builder as builder-unique-current2223ARG PROFILE=release2425WORKDIR /unique_parachain2627RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b {{ MAINNET_BRANCH }} . && \28   cargo build --features={{ NETWORK }}-runtime --$PROFILE2930# ===== BUILD target version ======31FROM rust-builder as builder-unique-target3233ARG PROFILE=release3435COPY . /unique_parachain36WORKDIR /unique_parachain3738RUN cargo build --features={{ NETWORK }}-runtime{{ EXTRA_FEATURES }} --$PROFILE3940# ===== RUN ======41FROM ubuntu:22.044243ENV RELAY_CHAIN_TYPE={{ RELAY_CHAIN_TYPE }}44ENV REPLICA_FROM={{ REPLICA_FROM }}45ENV NEW_PARA_BIN=/unique-chain/target/release/unique-collator46ENV NEW_PARA_WASM=/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm4748RUN apt-get -y update && \49    apt-get -y install curl git && \50    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \51    export NVM_DIR="$HOME/.nvm" && \52    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \53    nvm install v16.16.0 && \54    nvm use v16.16.05556RUN env5758COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/59COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/60COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm6162COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/zombienet-forkless-data.toml /unique-chain/tests/zombienet-forkless.toml63COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /unique-chain/tests/fork.jsonnet64COPY --from=builder-unique-target /unique_parachain/tests/ /unique-chain/tests/6566COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/6768COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/69COPY --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.wasm70COPY --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.wasm7172CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM NEW_PARA_BIN NEW_PARA_WASM RELAY_CHAIN_TYPE && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /unique-chain/tests && \75    npm install --global yarn && \76    yarn install && \77    yarn frankenstein zombienet-forkless.toml
added.docker/forkless-config/zombienet-forkless-data.tomldiffbeforeafterboth
--- /dev/null
+++ b/.docker/forkless-config/zombienet-forkless-data.toml
@@ -0,0 +1,46 @@
+[settings]
+provider = "native"
+
+[relaychain]
+default_command = "/polkadot/target/release/polkadot"
+default_args = [ "-lparachain::candidate_validation=debug", "-lxcm=trace", ]
+chain = "{{ RELAY_CHAIN_TYPE }}-local"
+
+  [[relaychain.nodes]]
+  name = "relay-alice"
+  ws_port = 9844
+  rpc_port = 9843
+  p2p_port = 30444
+
+  [[relaychain.node_groups]]
+  name = "relay"
+  count = 4
+
+[[parachains]]
+id = 1000
+chain_spec_modifier_commands = [[
+  "chainql",
+  "--tla-code=rawSpec=import '{{'raw'|chainSpec}}'",
+  "--tla-str=forkFrom={{ REPLICA_FROM }}",
+  "fork.jsonnet",
+]]
+
+  [[parachains.collators]]
+  name = "alice"
+  command = "/unique-chain/current/release/unique-collator"
+  ws_port = 9944
+  rpc_port = 9933
+  p2p_port = 31200
+  args = [
+    "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
+  ]
+
+  [[parachains.collators]]
+  name = "bob"
+  command = "/unique-chain/current/release/unique-collator"
+  ws_port = 9945
+  rpc_port = 9934
+  p2p_port = 31201
+  args = [
+    "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
+  ]
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