git.delta.rocks / unique-network / refs/commits / 320ff21d0a7c

difftreelog

delete hardcode for polkadot_launch_branch in ci

Konstantin Astakhov2022-10-27parent: #3fe954d.patch.diff
in: master

16 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -6,8 +6,8 @@
 LABEL maintainer="Unique.Network"
 
 ARG RUST_TOOLCHAIN=
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
@@ -48,8 +48,7 @@
 
 FROM ubuntu:20.04
 
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
@@ -59,7 +58,7 @@
       nvm install v16.16.0 && \
       nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -75,5 +74,4 @@
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
-    yarn start launch-config.json
-
+    yarn start launch-config.json
\ No newline at end of file
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -59,10 +59,8 @@
 
 FROM ubuntu:20.04
 
-ARG RUNTIME=
-ENV RUNTIME $RUNTIME
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+ARG RUNTIME
+ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -72,7 +70,7 @@
     nvm install v16.16.0 && \
     nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -81,7 +79,6 @@
     yarn install
 
 RUN echo "$RUNTIME"
-RUN echo "$POLKADOT_BUILD_BRANCH"
 
 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/
@@ -94,5 +91,3 @@
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     yarn start launch-config.json --test-upgrade-parachains -w -n
-
-
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -60,10 +60,8 @@
 
 FROM ubuntu:20.04
 
-ARG RUNTIME=
-ENV RUNTIME $RUNTIME
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+ARG RUNTIME
+ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -73,7 +71,7 @@
     nvm install v16.16.0 && \
     nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -82,7 +80,6 @@
     yarn install
 
 RUN echo "$RUNTIME"
-RUN echo "$POLKADOT_BUILD_BRANCH"
 
 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/
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -60,12 +60,9 @@
 
 FROM ubuntu:20.04
 
-ARG RUNTIME=
-ENV RUNTIME $RUNTIME
-ARG REPLICA_FROM=
-ENV REPLICA_FROM=$REPLICA_FROM
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+ARG RUNTIME
+ARG REPLICA_FROM
+ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -75,7 +72,7 @@
     nvm install v16.16.0 && \
     nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b unique-network
+RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b ${POLKADOT_LAUNCH_BRANCH}
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -85,7 +82,6 @@
 
 RUN echo "$RUNTIME"
 RUN echo "$REPLICA_FROM"
-RUN echo "$POLKADOT_BUILD_BRANCH"
 
 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/
modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -37,7 +37,7 @@
 
 RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
     cd unique-chain && \
-    cargo build --features={{ FEATURE }} --$PROFILE
+    cargo build --features={{ NETWORK }}-runtime --$PROFILE
 
 # ===== RUN ======
 
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,7 @@
         - "FEATURE={{ FEATURE }}"
         - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
         - "REPLICA_FROM={{ REPLICA_FROM }}"
modified.docker/docker-compose.tmp-forkless-nodata.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-nodata.j2
+++ b/.docker/docker-compose.tmp-forkless-nodata.j2
@@ -10,6 +10,7 @@
         - "FEATURE={{ FEATURE }}"
         - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
       context: ../
modified.docker/docker-compose.tmp-node.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-node.j2
+++ b/.docker/docker-compose.tmp-node.j2
@@ -10,6 +10,7 @@
         - "FEATURE={{ FEATURE }}"
         - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
       context: ../
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -19,4 +19,5 @@
 WESTMINT_BUILD_BRANCH=parachains-v9290
 OPAL_MAINNET_TAG=quartz-v924012-2-old-tests-fixes
 OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
+
 POLKADOT_LAUNCH_BRANCH=unique-network
modified.github/workflows/ci-master.ymldiffbeforeafterboth
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -33,5 +33,9 @@
     uses: ./.github/workflows/xcm.yml
     secrets: inherit # pass all secrets from initial workflow to nested
 
+  # testnet:
+  #   uses: ./.github/workflows/testnet-build.yml
+  #   secrets: inherit # pass all secrets from initial workflow to nested
+
   codestyle:
     uses: ./.github/workflows/codestyle.yml
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -74,6 +74,7 @@
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -75,6 +75,7 @@
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
before ยท .github/workflows/integration-tests.yml
1# Test workflow for debug parallel and sequental tests in scope of execution time reducing.2name: Integration tests34# Triger: only call from main workflow(re-usable workflows)5on:6  workflow_call:7#Define Workflow variables89# A workflow run is made up of one or more jobs that can run sequentially or in parallel10jobs:1112  nodes-execution-matrix:1314    name: execution matrix1516    runs-on: self-hosted-ci17    outputs:18      matrix: ${{ steps.create_matrix.outputs.matrix }}1920    steps:2122      - name: Clean Workspace23        uses: AutoModality/action-clean@v1.1.02425      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it26      - uses: actions/checkout@v327        with:28          ref: ${{ github.head_ref }}  #Checking out head commit2930      - name: Read .env file31        uses: xom9ikk/dotenv@v1.0.23233      - name: Create Execution matrix34        uses: fabiocaccamo/create-matrix-action@v235        id: create_matrix36        with:37          matrix: |38            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}39            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}40            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}41 42  parallel-test:43    needs: nodes-execution-matrix44    # The type of runner that the job will run on45    runs-on: [self-hosted-ci,large]46474849    timeout-minutes: 13805051    name: ${{ matrix.network }} - parallel5253    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.5455    strategy:56      matrix:57        include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}5859    steps:6061      - name: Clean Workspace62        uses: AutoModality/action-clean@v1.1.06364      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it65      - uses: actions/checkout@v366        with:67          ref: ${{ github.head_ref }}  #Checking out head commit6869      - name: Read .env file70        uses: xom9ikk/dotenv@v1.0.27172      - name: Generate ENV related extend file for docker-compose73        uses: cuchi/jinja2-action@v1.2.074        with:75          template: .docker/docker-compose.tmp-node.j276          output_file: .docker/docker-compose.node.${{ matrix.network }}.yml77          variables: |78            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git79            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}80            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}81            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}82            MAINNET_TAG=${{ matrix.mainnet_tag }}83            MAINNET_BRANCH=${{ matrix.mainnet_branch }}84            FEATURE=${{ matrix.features }}85            RUNTIME=${{ matrix.runtime }}86            BRANCH=${{ github.head_ref }}87            88      - name: Show build configuration89        run: cat .docker/docker-compose.node.${{ matrix.network }}.yml9091      - name: Generate launch-config-forkless-nodata.json92        uses: cuchi/jinja2-action@v1.2.093        with:94          template: .docker/forkless-config/launch-config-node-update-only-v3.j295          output_file: .docker/launch-config-forkless-nodata.json96          variables: |97            FEATURE=${{ matrix.features }}98            RUNTIME=${{ matrix.runtime }}99            100      - name: Show launch-config-forkless configuration101        run: cat .docker/launch-config-forkless-nodata.json102103      - uses: actions/setup-node@v3104        with:105          node-version: 16106107      - name: Build the stack108        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300109110      #  ๐Ÿš€ POLKADOT LAUNCH COMPLETE ๐Ÿš€111      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.112        if: success()113        run: |114          counter=160115          function check_container_status {116                docker inspect -f {{.State.Running}} node-parachain117          }118          function do_docker_logs {119                docker logs --details node-parachain  2>&1120          }121          function is_started {122                if [ "$(check_container_status)" == "true" ]; then123                        echo "Container: node-parachain RUNNING";124                        echo "Check Docker logs"125                        DOCKER_LOGS=$(do_docker_logs)126                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then127                                echo "๐Ÿš€ POLKADOT LAUNCH COMPLETE ๐Ÿš€"128                                return 0129                        else130                                echo "Message not found in logs output, repeating..."131                                return 1132                        fi133                else134                        echo "Container node-parachain NOT RUNNING"135                        echo "Halting all future checks"136                        exit 1137                fi138          echo "something goes wrong"139          exit 1140          }141          while ! is_started; do142                echo "Waiting for special message in log files "143                sleep 30s144                counter=$(( $counter - 1 ))145                echo "Counter: $counter"146                if [ "$counter" -gt "0" ]; then147                         continue148                else149                         break150                fi151          done152          echo "Halting script"153          exit 0154        shell: bash155156      - name: Run Parallel tests on Node Parachain157        working-directory: tests158        run: |159          yarn install160          yarn add mochawesome161          echo "Ready to start tests"162          yarn polkadot-types163          NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}164        env:165          RPC_URL: http://127.0.0.1:9933/166167      - name: Parallel Tests report168        uses: phoenix-actions/test-reporting@v8169        id: test-report-parallel170        if: success() || failure()    # run this step even if previous step failed171        with:172          name: Parallel Tests report - ${{ matrix.network }}            # Name of the check run which will be created173          path: tests/mochawesome-report/test-parallel-*.json    # Path to test results174          reporter: mochawesome-json175          fail-on-error: 'false'176    177             178      - name: Stop running containers179        if: always()                   # run this step always180        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes181182      - name: Remove builder cache183        if: always()                   # run this step always184        run: |185          docker builder prune -f -a186          docker system prune -f187          docker image prune -f -a188          189      - name: List files in Workspace190        if: always()191        run: ls -la ./192193  sequential-test:194    needs: nodes-execution-matrix195    # The type of runner that the job will run on196    runs-on: [self-hosted-ci,large]197198    timeout-minutes: 1380199200    name: ${{ matrix.network }} - sequential201202    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.203204    strategy:205      matrix:206        include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}207208    steps:209210      - name: Clean Workspace211        uses: AutoModality/action-clean@v1.1.0212213      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it214      - uses: actions/checkout@v3215        with:216          ref: ${{ github.head_ref }}  #Checking out head commit217218      - name: Read .env file219        uses: xom9ikk/dotenv@v1.0.2220221      - name: Generate ENV related extend file for docker-compose222        uses: cuchi/jinja2-action@v1.2.0223        with:224          template: .docker/docker-compose.tmp-node.j2225          output_file: .docker/docker-compose.node.${{ matrix.network }}.yml226          variables: |227            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git228            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}229            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}230            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}231            MAINNET_TAG=${{ matrix.mainnet_tag }}232            MAINNET_BRANCH=${{ matrix.mainnet_branch }}233            FEATURE=${{ matrix.features }}234            RUNTIME=${{ matrix.runtime }}235            BRANCH=${{ github.head_ref }}236            237      - name: Show build configuration238        run: cat .docker/docker-compose.node.${{ matrix.network }}.yml239240      - name: Generate launch-config-forkless-nodata.json241        uses: cuchi/jinja2-action@v1.2.0242        with:243          template: .docker/forkless-config/launch-config-node-update-only-v3.j2244          output_file: .docker/launch-config-forkless-nodata.json245          variables: |246            FEATURE=${{ matrix.features }}247            RUNTIME=${{ matrix.runtime }}248            249      - name: Show launch-config-forkless configuration250        run: cat .docker/launch-config-forkless-nodata.json251252      - uses: actions/setup-node@v3253        with:254          node-version: 16255256      - name: Build the stack257        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300258259      #  ๐Ÿš€ POLKADOT LAUNCH COMPLETE ๐Ÿš€260      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.261        if: success()262        run: |263          counter=160264          function check_container_status {265                docker inspect -f {{.State.Running}} node-parachain266          }267          function do_docker_logs {268                docker logs --details node-parachain  2>&1269          }270          function is_started {271                if [ "$(check_container_status)" == "true" ]; then272                        echo "Container: node-parachain RUNNING";273                        echo "Check Docker logs"274                        DOCKER_LOGS=$(do_docker_logs)275                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then276                                echo "๐Ÿš€ POLKADOT LAUNCH COMPLETE ๐Ÿš€"277                                return 0278                        else279                                echo "Message not found in logs output, repeating..."280                                return 1281                        fi282                else283                        echo "Container node-parachain NOT RUNNING"284                        echo "Halting all future checks"285                        exit 1286                fi287          echo "something goes wrong"288          exit 1289          }290          while ! is_started; do291                echo "Waiting for special message in log files "292                sleep 30s293                counter=$(( $counter - 1 ))294                echo "Counter: $counter"295                if [ "$counter" -gt "0" ]; then296                         continue297                else298                         break299                fi300          done301          echo "Halting script"302          exit 0303        shell: bash304305      - name: Run Sequential tests on Node Parachain306        working-directory: tests307        run: |308          yarn install309          yarn add mochawesome310          echo "Ready to start tests"311          yarn polkadot-types312          NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}313        env:314          RPC_URL: http://127.0.0.1:9933/315316      - name: Sequential Tests report317        uses: phoenix-actions/test-reporting@v8318        id: test-report-sequential319        if: success() || failure()    # run this step even if previous step failed320        with:321          name: Parallel Tests report - ${{ matrix.network }}            # Name of the check run which will be created322          path: tests/mochawesome-report/test-sequential-*.json    # Path to test results323          reporter: mochawesome-json324          fail-on-error: 'false'325       326      - name: Stop running containers327        if: always()                   # run this step always328        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes329330      - name: Remove builder cache331        if: always()                   # run this step always332        run: |333          docker builder prune -f -a334          docker system prune -f335          docker image prune -f -a336          337      - name: List files in Workspace338        if: always()339        run: ls -la ./
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -80,6 +80,7 @@
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
modified.github/workflows/testnet-build.ymldiffbeforeafterboth
--- a/.github/workflows/testnet-build.yml
+++ b/.github/workflows/testnet-build.yml
@@ -1,27 +1,15 @@
-name: testnet-build
+name: testnet-image-build
 
 # Controls when the action will run.
 on:
- # Triggers the workflow on push or pull request events but only for the master branch
-  pull_request:
-    branches:
-      - master
-    types:
-      - opened
-      - reopened
-      - synchronize   #commit(s) pushed to the pull request
-      - ready_for_review
-
+  workflow_call:
+  
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 #Define Workflow variables
 env:
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
modified.github/workflows/xcm.ymldiffbeforeafterboth
--- a/.github/workflows/xcm.yml
+++ b/.github/workflows/xcm.yml
@@ -40,9 +40,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.WESTMINT_BUILD_BRANCH }}}, runtest {testXcmOpal}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, acala_version {${{ env.KARURA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONRIVER_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINE_BUILD_BRANCH }}}, runtest {testXcmQuartz}
-            network {unique}, runtime {unique}, features {unique-runtime}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINT_BUILD_BRANCH }}}, runtest {testXcmUnique}
+            network {opal}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.WESTMINT_BUILD_BRANCH }}}, runtest {testXcmOpal}
+            network {quartz}, acala_version {${{ env.KARURA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONRIVER_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINE_BUILD_BRANCH }}}, runtest {testXcmQuartz}
+            network {unique}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINT_BUILD_BRANCH }}}, runtest {testXcmUnique}
 
   xcm-build:
     
@@ -229,9 +229,7 @@
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             NETWORK=${{ matrix.network }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
-            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}           
             BRANCH=${{ github.head_ref }}
             ACALA_BUILD_BRANCH=${{ matrix.acala_version }}
             MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}