git.delta.rocks / unique-network / refs/commits / 6f79f09ea997

difftreelog

ci collator-selection for dockerhub

Konstantin Astakhov2023-06-23parent: #c575769.patch.diff
in: master

5 files changed

deleted.docker/Dockerfile-collatorsdiffbeforeafterboth
--- a/.docker/Dockerfile-collators
+++ /dev/null
@@ -1,74 +0,0 @@
-ARG POLKADOT_BUILD_BRANCH
-FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
-
-# ===== Rust builder =====
-FROM uniquenetwork/services:latest as rust-builder
-ARG RUST_TOOLCHAIN=
-
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
-ENV TZ=UTC
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
-    rustup toolchain install $RUST_TOOLCHAIN && \
-    rustup default $RUST_TOOLCHAIN && \
-    rustup target list --installed && \
-    rustup show
-RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-RUN mkdir /unique_parachain
-WORKDIR /unique_parachain
-
-# ===== BUILD ======
-FROM rust-builder as builder-unique
-
-ARG PROFILE=release
-ARG NETWORK
-ARG POLKADOT_LAUNCH_BRANCH
-ARG BRANCH
-
-ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $BRANCH https://github.com/UniqueNetwork/unique-chain.git && \
-    cd unique-chain && \
-    cargo build --features=$NETWORK-runtime --$PROFILE
-
-# ===== RUN ======
-
-FROM ubuntu:22.04
-
-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
-
-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" && \
-    cd /polkadot-launch && \
-    npm install --global yarn && \
-    yarn install
-
-COPY --from=builder-unique /unique_parachain/unique-chain/.docker/testnet-config/launch-config.json /polkadot-launch/launch-config.json
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
-
-COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
-
-CMD export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json
added.docker/Dockerfile-collators.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-collators.j2
@@ -0,0 +1,64 @@
+FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot
+
+# ===== Rust builder =====
+FROM uniquenetwork/services:latest as rust-builder
+
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
+ENV TZ=UTC
+RUN rustup toolchain uninstall $(rustup toolchain list) && \
+    rustup toolchain install {{ RUST_TOOLCHAIN }} && \
+    rustup default {{ RUST_TOOLCHAIN }} && \
+    rustup target list --installed && \
+    rustup show
+RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+# ===== BUILD ======
+FROM rust-builder as builder-unique
+
+WORKDIR /unique_parachain
+
+ARG PROFILE=release
+
+RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b {{ BRANCH }} . && \
+    cargo build --features={{ NETWORK }}-runtime --$PROFILE
+
+# ===== RUN ======
+
+FROM ubuntu:22.04
+
+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
+
+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" && \
+    cd /polkadot-launch && \
+    npm install --global yarn && \
+    yarn install
+
+COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
+
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+
+EXPOSE 9844
+EXPOSE 9944
+EXPOSE 9933
+EXPOSE 9833
+EXPOSE 40333
+EXPOSE 30333
+
+CMD export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    cd /polkadot-launch && \
+    yarn start launch-config.json
\ No newline at end of file
added.docker/docker-compose.collators.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose.collators.j2
@@ -0,0 +1,12 @@
+version: "3.5"
+
+services:
+  forkless-data:
+    image: uniquenetwork/ci-collator-selection-local:{{ NETWORK }}-{{ BUILD_TAG }}
+    container_name: collator-selection-{{ NETWORK }}
+    expose:
+      - 9944
+      - 9933
+    ports:
+      - 127.0.0.1:9944:9944
+      - 127.0.0.1:9933:9933
deleted.docker/docker-compose.tmp-collators.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-collators.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-version: "3.5"
-
-services:
-  parachain-collators:
-    build:
-      args:
-        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
-        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
-        - "NETWORK={{ NETWORK }}"
-        - "BRANCH={{ BRANCH }}"
-      context: ../
-      dockerfile: .docker/Dockerfile-parachain
-    image: parachain-collators
-    container_name: parachain-collators
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
modified.github/workflows/collator-selection.ymldiffbeforeafterboth
before · .github/workflows/collator-selection.yml
1name: collator-selection-test-run23# Triger: only call from main workflow(re-usable workflows)4on:5  workflow_call:67# A workflow run is made up of one or more jobs that can run sequentially or in parallel8jobs:9  execution-marix:10    name: Prepare execution matrix1112    runs-on: self-hosted-ci13    outputs:14      matrix: ${{ steps.create_matrix.outputs.matrix }}1516    steps:1718      - name: Clean Workspace19        uses: AutoModality/action-clean@v1.1.02021      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it22      - uses: actions/checkout@v323        with:24          ref: ${{ github.head_ref }}  #Checking out head commit2526      - name: Read .env file27        uses: xom9ikk/dotenv@v22829      - name: Create Execution matrix30        uses: CertainLach/create-matrix-action@v331        id: create_matrix32        with:33          matrix: |34            network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}35            network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}36            network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}3738  collator-selection:39    needs: execution-marix40    # The type of runner that the job will run on41    runs-on: [self-hosted-ci,large]42    timeout-minutes: 13804344    name: ${{ matrix.network }}45    strategy:46      matrix:47        include: ${{fromJson(needs.execution-marix.outputs.matrix)}}4849    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.5051    steps:52      - name: Clean Workspace53        uses: AutoModality/action-clean@v1.1.05455      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it56      - uses: actions/checkout@v357        with:58          ref: ${{ github.head_ref }}  #Checking out head commit5960      - name: Read .env file61        uses: xom9ikk/dotenv@v26263      - name: Generate ENV related extend file for docker-compose64        uses: cuchi/jinja2-action@v1.2.065        with:66          template: .docker/docker-compose.tmp-collators.j267          output_file: .docker/docker-compose.collators.${{ matrix.network }}.yml68          variables: |69            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}70            POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}71            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}72            NETWORK=${{ matrix.network }}73            BRANCH=${{ github.head_ref }}7475      - name: Show build configuration76        run: cat .docker/docker-compose.collators.${{ matrix.network }}.yml7778      - name: Show launch-config configuration79        run: cat launch-config.json8081      - name: Build the stack82        run: docker-compose -f ".docker/docker-compose.collators.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 3008384      #  🚀 POLKADOT LAUNCH COMPLETE 🚀85      - name: Check if docker logs consist messages related to testing of collator tests 86        if: success()87        run: |88          counter=16089          function check_container_status {90                docker inspect -f {{.State.Running}} parachain-collators91          }92          function do_docker_logs {93                docker logs --details parachain-collators  2>&194          }95          function is_started {96                if [ "$(check_container_status)" == "true" ]; then97                        echo "Container: collator-${{ matrix.network }}-testnet-local RUNNING";98                        echo "Check Docker logs"99                        DOCKER_LOGS=$(do_docker_logs)100                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then101                                echo "🚀 POLKADOT LAUNCH COMPLETE 🚀"102                                return 0103                        else104                                echo "Message not found in logs output, repeating..."105                                return 1106                        fi107                else108                        echo "Container collator-${{ matrix.network }}-testnet-local NOT RUNNING"109                        echo "Halting all future checks"110                        exit 1111                fi112          echo "something goes wrong"113          exit 1114          }115          while ! is_started; do116                echo "Waiting for special message in log files "117                sleep 30s118                counter=$(( $counter - 1 ))119                echo "Counter: $counter"120                if [ "$counter" -gt "0" ]; then121                         continue122                else123                         break124                fi125          done126          echo "Halting script"127          exit 0128        shell: bash129130      - uses: actions/setup-node@v3131        with:132          node-version: 16133134      - name: Run Collator tests135        working-directory: tests136        if: success() || failure()137        run: |138          yarn install139          yarn add mochawesome140          node scripts/readyness.js141          echo "Ready to start tests"142          yarn polkadot-types143          NOW=$(date +%s) && yarn testCollators --reporter mochawesome --reporter-options reportFilename=test-collators-${NOW}144        env:145          RPC_URL: http://127.0.0.1:9933/146147      - name: Test Report Collator148        uses: phoenix-actions/test-reporting@v8149        id: test-report-collator150        if: success() || failure()    # run this step even if previous step failed151        with:152          name: Report Collator tests results - ${{ matrix.network }}            # Name of the check run which will be created153          path: tests/mochawesome-report/test-collators-*.json    # Path to test results154          reporter: mochawesome-json155          fail-on-error: 'false'156157      - name: Stop running containers158        if: always()                   # run this step always159        run: docker-compose -f ".docker/docker-compose.collators.${{ matrix.network }}.yml" down160161      - name: Remove builder cache162        if: always()                   # run this step always163        run: |164          docker builder prune -f -a165          docker system prune -f