git.delta.rocks / unique-network / refs/commits / f3145976c2e9

difftreelog

merge docker-compose files

Konstantin Astakhov2022-10-31parent: #ebc7f6f.patch.diff
in: master

3 files changed

modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -101,7 +101,7 @@
           node-version: 16
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
+        run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
 
       - name: Check if docker logs consist logs related to Runtime Upgrade testing.
         if: success()
@@ -208,7 +208,7 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
+        run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" down
         
       - name: Remove builder cache
         if: always()                   # run this step always
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -44,8 +44,6 @@
     # The type of runner that the job will run on
     runs-on: [self-hosted-ci,large]
 
-
-
     timeout-minutes: 1380
 
     name: ${{ matrix.network }} - parallel
@@ -104,7 +102,7 @@
           node-version: 16
 
       - name: Build the stack
-        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 300
+        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300
 
       #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€
       - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
@@ -176,7 +174,7 @@
              
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
+        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
 
       - name: Remove builder cache
         if: always()                   # run this step always
@@ -252,7 +250,7 @@
           node-version: 16
 
       - name: Build the stack
-        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 300
+        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300
 
       #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€
       - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
@@ -323,7 +321,7 @@
        
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
+        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
 
       - name: Remove builder cache
         if: always()                   # run this step always
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
before Β· .github/workflows/node-only-update.yml
1# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586837028/Nodes+only+update2# Node only update with restart polkadot-launch process.34name: nodes-only update56# Triger: only call from main workflow(re-usable workflows)7on:8  workflow_call:91011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:1314  nodes-execution-matrix:1516    name: execution matrix1718    runs-on: self-hosted-ci19    outputs:20      matrix: ${{ steps.create_matrix.outputs.matrix }}2122    steps:2324      - name: Clean Workspace25        uses: AutoModality/action-clean@v1.1.02627      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it28      - uses: actions/checkout@v329        with:30          ref: ${{ github.head_ref }}  #Checking out head commit3132      - name: Read .env file33        uses: xom9ikk/dotenv@v23435      - name: Create Execution matrix36        uses: CertainLach/create-matrix-action@v337        id: create_matrix38        with:39          matrix: |40            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}41            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}42            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}43444546  nodes-only-update:47    needs: nodes-execution-matrix48    # The type of runner that the job will run on49    runs-on: [self-hosted-ci,large]5051    timeout-minutes: 2880           # 48 hours for execution jobs.5253    name: ${{ matrix.network }}5455    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.5657    strategy:58      matrix:59        include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}6061    steps:6263      - name: Clean Workspace64        uses: AutoModality/action-clean@v1.1.06566      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it67      - uses: actions/checkout@v368        with:69          ref: ${{ github.head_ref }}  #Checking out head commit7071      - name: Read .env file72        uses: xom9ikk/dotenv@v27374      - name: Generate ENV related extend file for docker-compose75        uses: cuchi/jinja2-action@v1.2.076        with:77          template: .docker/docker-compose.tmp-node.j278          output_file: .docker/docker-compose.node.${{ matrix.network }}.yml79          variables: |80            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git81            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}82            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}83            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            84            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}85            MAINNET_TAG=${{ matrix.mainnet_tag }}86            MAINNET_BRANCH=${{ matrix.mainnet_branch }}87            NETWORK=${{ matrix.network }}88            BRANCH=${{ github.head_ref }}8990      - name: Show build configuration91        run: cat .docker/docker-compose.node.${{ matrix.network }}.yml9293      - name: Generate launch-config-forkless-nodata.json94        uses: cuchi/jinja2-action@v1.2.095        with:96          template: .docker/forkless-config/launch-config-forkless-nodata.j297          output_file: .docker/launch-config-forkless-nodata.json98          variables: |99            NETWORK=${{ matrix.network }}100101      - name: Show launch-config-forkless configuration102        run: cat .docker/launch-config-forkless-nodata.json103104      - uses: actions/setup-node@v3105        with:106          node-version: 16107108      - name: Build the stack109        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 300110111      #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€112      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.113        if: success()114        run: |115          counter=160116          function check_container_status {117                docker inspect -f {{.State.Running}} node-parachain118          }119          function do_docker_logs {120                docker logs --details node-parachain  2>&1121          }122          function is_started {123                if [ "$(check_container_status)" == "true" ]; then124                        echo "Container: node-parachain RUNNING";125                        echo "Check Docker logs"126                        DOCKER_LOGS=$(do_docker_logs)127                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then128                                echo "πŸš€ POLKADOT LAUNCH COMPLETE πŸš€"129                                return 0130                        else131                                echo "Message not found in logs output, repeating..."132                                return 1133                        fi134                else135                        echo "Container node-parachain NOT RUNNING"136                        echo "Halting all future checks"137                        exit 1138                fi139          echo "something goes wrong"140          exit 1141          }142          while ! is_started; do143                echo "Waiting for special message in log files "144                sleep 30s145                counter=$(( $counter - 1 ))146                echo "Counter: $counter"147                if [ "$counter" -gt "0" ]; then148                         continue149                else150                         break151                fi152          done153          echo "Halting script"154          exit 0155        shell: bash156157      - name: Checkout at '${{ matrix.mainnet_branch }}' branch158        uses: actions/checkout@master159        with:160          ref: ${{ matrix.mainnet_branch }}  #Checking out head commit161          path: ${{ matrix.mainnet_branch }}162163      - name: Run tests before Node Parachain upgrade164        working-directory: ${{ matrix.mainnet_branch }}/tests165        run: |166          yarn install167          yarn add mochawesome168          echo "Ready to start tests"169          yarn polkadot-types170          NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-before-${NOW}171        env:172          RPC_URL: http://127.0.0.1:9933/173174      - name: Upload Test Report Before Node upgrade175        uses: phoenix-actions/test-reporting@v8176        id: test-report-before177        if: success() || failure()    # run this step even if previous step failed178        with:179          name: Tests before node upgrade ${{ matrix.network }}            # Name of the check run which will be created180          path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-before-*.json    # Path to test results181          reporter: mochawesome-json182          fail-on-error: 'false'183184      # TODO uncomment thease steps after the merge185      #- name: Run Parallel tests before Node Parachain upgrade186      #  working-directory: ${{ matrix.mainnet_branch }}/tests187      #  run: |188      #    yarn install189      #    yarn add mochawesome190      #    echo "Ready to start tests"191      #    yarn polkadot-types192      #    NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}193      #  env:194      #    RPC_URL: http://127.0.0.1:9933/195196      #- name: Upload Parallel Test Report Before Node upgrade197      #  uses: phoenix-actions/test-reporting@v8198      #  id: test-parallel-report-before199      #  if: success() || failure()    # run this step even if previous step failed200      #  with:201      #    name: Tests before node upgrade ${{ matrix.network }}            # Name of the check run which will be created202      #    path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-parallel-*.json    # Path to test results203      #    reporter: mochawesome-json204      #    fail-on-error: 'false'205206      # - name: Run Sequential tests before Node Parachain upgrade207      #   if: success() || failure()208      #   working-directory: ${{ matrix.mainnet_branch }}/tests209      #   run: NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}210      #   env:211      #     RPC_URL: http://127.0.0.1:9933/212213      # - name: Upload Sequential Test Report Before Node upgrade214      #   uses: phoenix-actions/test-reporting@v8215      #   id: test-sequential-report-before216      #   if: success() || failure()    # run this step even if previous step failed217      #   with:218      #     name: Tests before node upgrade ${{ matrix.network }}            # Name of the check run which will be created219      #     path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-sequential-*.json    # Path to test results220      #     reporter: mochawesome-json221      #     fail-on-error: 'false'222     223      - name: Send SIGUSR1 to polkadot-launch process224        if: success() || failure()225        run: |226          #Get PID of polkadot-launch227          ContainerID=$(docker ps -aqf "name=node-parachain")228          PID=$(docker exec node-parachain pidof 'polkadot-launch')229          sleep 30s230          echo -e "Show logs of node-parachain container.\n"231          docker logs ${ContainerID}232          echo -e "\n"233          echo -e "Restart polkadot-launch process: $PID\n"234          docker exec node-parachain kill -SIGUSR1 ${PID}235          echo "SIGUSR1 sent to Polkadot-launch PID: $PID"236          docker logs ${ContainerID}237      238      - name: Get chain logs in case of docker image crashed after Polkadot Launch restart239        if: failure()                   # run this step only at failure240        run: |241          docker exec node-parachain cat /polkadot-launch/9944.log242          docker exec node-parachain cat /polkadot-launch/9945.log243          docker exec node-parachain cat /polkadot-launch/alice.log244          docker exec node-parachain cat /polkadot-launch/eve.log245          docker exec node-parachain cat /polkadot-launch/dave.log246          docker exec node-parachain cat /polkadot-launch/charlie.log             247248      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.249        if: success()250        run: |251          counter=160252          function check_container_status {253                docker inspect -f {{.State.Running}} node-parachain254          }255          function do_docker_logs {256                docker logs --details node-parachain  2>&1257          }258          function is_started {259                if [ "$(check_container_status)" == "true" ]; then260                        echo "Container: node-parachain RUNNING";261                        echo "Check Docker logs"262                        DOCKER_LOGS=$(do_docker_logs)263                        if [[ ${DOCKER_LOGS} = *"All parachain collators restarted with the new binaries."* ]];then264                                echo "πŸŒ— All parachain collators restarted with the new binaries."265                                return 0266                        else267                                echo "Message not found in logs output, repeating..."268                                return 1269                        fi270                else271                        echo "Container node-parachain NOT RUNNING"272                        echo "Halting all future checks"273                        exit 1274                fi275          echo "something goes wrong"276          exit 1277          }278          while ! is_started; do279                echo "Waiting for special message in log files "280                sleep 30s281                counter=$(( $counter - 1 ))282                echo "Counter: $counter"283                if [ "$counter" -gt "0" ]; then284                         continue285                else286                         break287                fi288          done289          echo "Halting script"290          exit 0291        shell: bash292        293      ## TODO: Remove next two blocks before switch to Parrallel & Sequental tests. Uncoment commented blocks.294      - name: Run tests after Node Parachain upgrade295        working-directory: ${{ matrix.mainnet_branch }}/tests296        run: |297          yarn install298          yarn add mochawesome299          echo "Ready to start tests"300          yarn polkadot-types301          NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-after-${NOW}302        env:303          RPC_URL: http://127.0.0.1:9933/304305      - name: Test Report After Node upgrade306        uses: phoenix-actions/test-reporting@v8307        id: test-report-after308        if: success() || failure()    # run this step even if previous step failed309        with:310          name: Tests after node upgrade ${{ matrix.network }}            # Name of the check run which will be created311          path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-after-*.json    # Path to test results312          reporter: mochawesome-json313          fail-on-error: 'false'314315      # TODO uncomment thease steps after the merge316      #- name: Run Parallel tests after Node Parachain upgrade317      #  working-directory: ${{ matrix.mainnet_branch }}/tests318      #  run: |319      #    yarn install320      #    yarn add mochawesome321      #    node scripts/readyness.js322      #    echo "Ready to start tests"323      #    yarn polkadot-types324      #    NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}325      #  env:326      #    RPC_URL: http://127.0.0.1:9933/327328      #- name: Test Report Parallel After Node upgrade329      #  uses: phoenix-actions/test-reporting@v8330      #  id: test-report-parallel-after331      #  if: success() || failure()    # run this step even if previous step failed332      #  with:333      #    name: Tests after node upgrade ${{ matrix.network }}            # Name of the check run which will be created334      #    path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-parallel-*.json    # Path to test results335      #    reporter: mochawesome-json336      #    fail-on-error: 'false'337      338      #- name: Run Sequential tests after Node Parachain upgrade339      #  if: success() || failure()340      #  working-directory: ${{ matrix.mainnet_branch }}/tests341      #  run: NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}342      #  env:343      #    RPC_URL: http://127.0.0.1:9933/344345      #- name: Upload Sequential Test Report After Node upgrade346      #  uses: phoenix-actions/test-reporting@v8347      #  id: test-sequential-report-after348      #  if: success() || failure()    # run this step even if previous step failed349      #  with:350      #    name: Tests before node upgrade ${{ matrix.network }}            # Name of the check run which will be created351      #    path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-sequential-*.json    # Path to test results352      #    reporter: mochawesome-json353      #    fail-on-error: 'false'354355356      - name: Stop running containers357        if: always()                   # run this step always358        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes359360      - name: Remove builder cache361        if: always()                   # run this step always362        run: |363          docker builder prune -f -a364          docker system prune -f365          docker image prune -f -a366367      - name: Remove repo at the end368        if: always()                   # run this step always369        run: |370          ls -ls ./