git.delta.rocks / unique-network / refs/commits / 4f3a2095e1df

difftreelog

ci synchronize forkless data/fork

Yaroslav Bolyukin2022-08-18parent: #7f428c4.patch.diff
in: master

6 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -24,10 +24,8 @@
     rustup show
 RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
 
-
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
-
 
 # ===== BUILD current version ======
 FROM rust-builder as builder-unique-current
@@ -42,7 +40,6 @@
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
     cargo build --features=$FEATURE --$PROFILE
 
-
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
@@ -77,12 +74,12 @@
 ENV RUNTIME $RUNTIME
 
 RUN apt-get -y update && \
-      apt-get -y install curl git && \
-      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
-      export NVM_DIR="$HOME/.nvm" && \
-      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-      nvm install v16.16.0 && \
-      nvm use v16.16.0
+    apt-get -y install curl git && \
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
+    export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    nvm install v16.16.0 && \
+    nvm use v16.16.0
 
 RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing
 
@@ -100,7 +97,6 @@
 
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=builder-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
-				      
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -5,7 +5,6 @@
 ARG RUST_TOOLCHAIN=
 
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
@@ -28,6 +27,19 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
+# ===== BUILD current version ======
+FROM rust-builder as builder-unique-current
+
+ARG PROFILE=release
+ARG FEATURE=
+ARG MAINNET_BRANCH=
+ARG REPO_URL=
+
+WORKDIR /unique_parachain
+
+RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
+    cargo build --features=$FEATURE --$PROFILE
+
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
@@ -59,7 +71,7 @@
 RUN mkdir chainql
 WORKDIR /chainql
 
-RUN git clone --depth 1 https://github.com/CertainLach/chainql.git . && \
+RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \
     cargo build --release
 
 # ===== RUN ======
@@ -70,14 +82,14 @@
 ENV RUNTIME $RUNTIME
 
 RUN apt-get -y update && \
-      apt-get -y install curl git && \
-      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
-      export NVM_DIR="$HOME/.nvm" && \
-      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-      nvm install v16.16.0 && \
-      nvm use v16.16.0
+    apt-get -y install curl git && \
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
+    export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    nvm install v16.16.0 && \
+    nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/parachain-forking
+RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b feature/parachain-forking
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -87,17 +99,18 @@
 
 RUN echo "$RUNTIME"
 
+COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
 
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/
 
-COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/
+COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=builder-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
 
 ARG FORK_FROM=
 ENV FORK_FROM=$FORK_FROM
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
-    yarn start launch-config.json
-
-
+    yarn start launch-config.json --test-upgrade-parachains
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-data.j2
+++ b/.docker/docker-compose.tmp-forkless-data.j2
@@ -10,6 +10,8 @@
         - "FEATURE={{ FEATURE }}"
         - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+        - "MAINNET_TAG={{ MAINNET_TAG }}"
+        - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
         - "FORK_FROM={{ FORK_FROM }}"
       context: ../
       dockerfile: .docker/Dockerfile-parachain-upgrade-data
@@ -23,7 +25,11 @@
        - type: bind
          source: ./forkless-config/fork.jsonnet
          target: /polkadot-launch/fork.jsonnet
-         read_only: true          
+         read_only: true
+       - type: bind
+         source: ./forkless-config/typeNames.jsonnet
+         target: /polkadot-launch/typeNames.jsonnet
+         read_only: true
     expose:
       - 9944
       - 9933
@@ -33,4 +39,4 @@
     logging:
       options:
         max-size: "1m"
-        max-file: "3"
\ No newline at end of file
+        max-file: "3"
modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -1,6 +1,8 @@
 {
       "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
+        "upgradeBin": "/polkadot/target/release/polkadot",
+        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",
         "chain": "westend-local",
         "nodes": [
             {
@@ -85,6 +87,8 @@
       "parachains": [
         {
             "bin": "/unique-chain/target/release/unique-collator",
+            "upgradeBin": "/unique-chain/target/release/unique-collator",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -6,3 +6,7 @@
 
 KUSAMA_MAINNET_BRANCH=release-v0.9.26
 QUARTZ_MAINNET_TAG=quartz-v924012-2
+
+OPAL_FORK_FROM=wss://eu-ws-opal.unique.network:443
+QUARTZ_FORK_FROM=wss://eu-ws-quartz.unique.network:443
+UNIQUE_FORK_FROM=wss://eu-ws.unique.network:443
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
26# A workflow run is made up of one or more jobs that can run sequentially or in parallel26# A workflow run is made up of one or more jobs that can run sequentially or in parallel
27jobs:27jobs:
28
29 prepare-execution-marix:
30
31 name: Prepare execution matrix
32
33 runs-on: self-hosted-ci
34 outputs:
35 matrix: ${{ steps.create_matrix.outputs.matrix }}
36
37 steps:
38
39 - name: Clean Workspace
40 uses: AutoModality/action-clean@v1.1.0
41
42 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
43 - uses: actions/checkout@v3
44 with:
45 ref: ${{ github.head_ref }} #Checking out head commit
46
47 - name: Read .env file
48 uses: xom9ikk/dotenv@v1.0.2
49
50 - name: Create Execution matrix
51 uses: CertainLach/create-matrix-action@v3
52 id: create_matrix
53 with:
54 matrix: |
55 network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.OPAL_FORK_FROM }}}
56 network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.QUARTZ_FORK_FROM }}}
57 network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {${{ env.UNIQUE_FORK_FROM }}}
58
59
2860
29 forkless-update-data:61 forkless-update-data:
62 needs: prepare-execution-marix
30 # The type of runner that the job will run on63 # The type of runner that the job will run on
31 runs-on: [self-hosted-ci,large]64 runs-on: [self-hosted-ci,large]
32 timeout-minutes: 138065 timeout-minutes: 1380
3772
38 strategy:73 strategy:
39 matrix:74 matrix:
40 include:75 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
41 - network: opal76
42 features: opal-runtime
43 runtime: opal
44 fork_from_address: wss://eu-ws-opal.unique.network:443
45 - network: quartz
46 features: quartz-runtime
47 runtime: quartz
48 fork_from_address: wss://eu-ws-quartz.unique.network:443
49 - network: unique
50 features: unique-runtime
51 runtime: unique
52 fork_from_address: wss://eu-ws.unique.network:443
5377
54 steps:78 steps:
55 - name: Skip if pull request is in Draft79 - name: Skip if pull request is in Draft
86 with:110 with:
87 template: .docker/docker-compose.tmp-forkless-data.j2111 template: .docker/docker-compose.tmp-forkless-data.j2
88 output_file: .docker/docker-compose.${{ matrix.network }}.yml112 output_file: .docker/docker-compose.${{ matrix.network }}.yml
89 variables: |113 variables: |
90 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git114 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
91 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}115 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
92 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}116 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
93 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}117 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
94 FEATURE=${{ matrix.features }}118 MAINNET_TAG=${{ matrix.mainnet_tag }}
119 MAINNET_BRANCH=${{ matrix.mainnet_branch }}
120 FEATURE=${{ matrix.features }}
95 RUNTIME=${{ matrix.runtime }}121 RUNTIME=${{ matrix.runtime }}
96 BRANCH=${{ github.head_ref }}122 BRANCH=${{ github.head_ref }}
97 FORK_FROM=${{ matrix.fork_from_address }}123 FORK_FROM=${{ matrix.fork_from_address }}
98124
99 - name: Show build configuration125 - name: Show build configuration
100 run: cat .docker/docker-compose.${{ matrix.network }}.yml126 run: cat .docker/docker-compose.${{ matrix.network }}.yml
117143
118 - name: Check if docker logs consist logs related to Runtime Upgrade testing.144 - name: Check if docker logs consist logs related to Runtime Upgrade testing.
119 if: success()145 if: success()
120 run: |146 run: |
121 counter=160147 counter=160
122 function do_docker_logs {148 function check_container_status {
123 docker logs --details parachain-fork 2>&1149 docker inspect -f {{.State.Running}} node-parachain
124 }150 }
125 function is_started {151 function do_docker_logs {
126 echo "Check Docker logs"152 docker logs --details node-parachain 2>&1
127 DOCKER_LOGS=$(do_docker_logs)153 }
128 if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then154 function is_started {
129 echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"155 if [ "$(check_container_status)" == "true" ]; then
130 return 0156 echo "Container: node-parachain RUNNING";
131 exit 0157 echo "Check Docker logs"
132 fi158 DOCKER_LOGS=$(do_docker_logs)
133 echo "Function is_started: Return 1"159 if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then
134 return 1160 echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"
135 }161 return 0
136 while ! is_started; do162 elif [[ ${DOCKER_LOGS} = *"🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"* ]];then
137 echo "Waiting for special message in log files "163 echo "🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"
138 sleep 30s164 return 1
139 counter=$(( $counter - 1 ))165 else
140 echo "Counter: $counter"166 echo "Message not found in logs output, repeating..."
141 if [ "$counter" -gt "0" ]; then167 return 1
142 continue168 fi
143 else169 else
144 break170 echo "Container node-parachain not RUNNING"
145 fi171 echo "Halting all future checks"
146 done172 exit 1
147 exit 1173 fi
174 exit 0
175 }
176 while ! is_started; do
177 echo "Waiting for special message in log files "
178 sleep 30s
179 counter=$(( $counter - 1 ))
180 echo "Counter: $counter"
181 if [ "$counter" -gt "0" ]; then
182 continue
183 else
184 break
185 fi
186 done
187 echo "Halting script"
188 exit 0
148 shell: bash189 shell: bash
149190
150 - name: Collect Docker Logs191 - name: Collect Docker Logs