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

difftreelog

Merge pull request #6 from lzadjsf/core-ci-step-2

Alex2022-08-02parents: #c231b03 #fe364df.patch.diff
in: master
Integration test for pull_request on master branch

7 files changed

added.docker/.envdiffbeforeafterboth
--- /dev/null
+++ b/.docker/.env
@@ -0,0 +1,7 @@
+RUST_TOOLCHAIN=nightly-2022-05-11
+RUST_C=1.62.0-nightly
+POLKA_VERSION=release-v0.9.24
+UNIQUE_BRANCH=develop
+FEATURE='--features=quartz-runtime --release'
+USER=***
+PASS=***
modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.1.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-116#ARG RUST_C=1.62.0-nightly7ARG POLKA_VERSION=release-v0.9.248ARG UNIQUE_BRANCH=develop910#ARG USER=***11#ARG PASS=***121314ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN15#ENV RUST_C $RUST_C16ENV POLKA_VERSION $POLKA_VERSION17ENV UNIQUE_BRANCH $UNIQUE_BRANCH181920#RUN echo $RUST_TOOLCHAIN21#RUN echo $RUST_C22#RUN echo $POLKA_VERSION23#RUN echo $UNIQUE_BRANCH2425ENV CARGO_HOME="/cargo-home"26ENV PATH="/cargo-home/bin:$PATH"2728RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2930RUN apt-get update && \31    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \32    apt-get install -y cmake pkg-config libssl-dev git clang3334RUN rustup toolchain uninstall $(rustup toolchain list) && \35    rustup toolchain install $RUST_TOOLCHAIN && \36    rustup default $RUST_TOOLCHAIN && \37    rustup target list --installed && \38    rustup show39RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN4041RUN cargo install cargo-chef4243RUN mkdir unique_parachain44WORKDIR /unique_parachain4546# ===== Chef =====47FROM rust-builder as chef4849COPY . .50RUN cargo chef prepare --recipe-path recipe.json5152# ===== BUILD ======53FROM rust-builder as builder5455RUN mkdir unique_parachain56WORKDIR /unique_parachain5758COPY --from=chef /unique_parachain/recipe.json recipe.json59ARG PROFILE=release60RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json6162COPY . .63RUN cargo build "--$PROFILE"64   # && \65   # cargo test6667# ===== BUILD POLKADOT =====68FROM rust-builder as builder-polkadot6970RUN mkdir unique_parachain71WORKDIR /unique_parachain7273RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \74    cd polkadot && \75    git tag -n && \76	cargo build --release7778# ===== RUN ======7980FROM phusion/baseimage:focal-1.1.08182ARG PROFILE=release8384RUN apt-get -y update && \85      apt-get -y upgrade && \86      apt-get -y install curl git && \87      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \88      export NVM_DIR="$HOME/.nvm" && \89      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \90      nvm install v15.5.0 && \91      nvm use v15.5.09293RUN git clone https://github.com/paritytech/polkadot-launch9495RUN export NVM_DIR="$HOME/.nvm" && \96    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \97    cd /polkadot-launch && \98    npm install --global yarn && \99    yarn100101COPY --from=builder /unique_parachain/target/$PROFILE/unique-collator /unique-chain/target/$PROFILE/102COPY --from=builder-polkadot /unique_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/103104EXPOSE 9844105EXPOSE 9944106EXPOSE 9933107EXPOSE 9833108EXPOSE 40333109EXPOSE 30333110111CMD export NVM_DIR="$HOME/.nvm" && \112    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \113    cd /polkadot-launch && \114    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.1.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-116ARG POLKA_VERSION=release-v0.9.24789ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN10ENV POLKA_VERSION $POLKA_VERSION1112ENV CARGO_HOME="/cargo-home"13ENV PATH="/cargo-home/bin:$PATH"1415RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1617RUN apt-get update && \18    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \19    apt-get install -y cmake pkg-config libssl-dev git clang2021RUN rustup toolchain uninstall $(rustup toolchain list) && \22    rustup toolchain install $RUST_TOOLCHAIN && \23    rustup default $RUST_TOOLCHAIN && \24    rustup target list --installed && \25    rustup show26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2728####works inside repo folder###293031# ===== BUILD ======32FROM rust-builder as builder-unique3334RUN mkdir unique_parachain35WORKDIR /unique_parachain3637ARG FEATURE='--release'3839COPY . .40RUN cargo build $FEATURE41   # && \42   # cargo test4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647RUN mkdir unique_parachain48WORKDIR /unique_parachain4950RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \51    cd polkadot && \52    git tag -n && \53	cargo build --release5455# ===== RUN ======5657FROM phusion/baseimage:focal-1.1.05859RUN apt-get -y update && \60      apt-get -y upgrade && \61      apt-get -y install curl git && \62      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \63      export NVM_DIR="$HOME/.nvm" && \64      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \65      nvm install v15.5.0 && \66      nvm use v15.5.06768RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \69    cd /polkadot-launch && \70    git checkout feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /polkadot-launch && \75    npm install --global yarn && \76    yarn7778COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8081COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]828384EXPOSE 984485EXPOSE 994486EXPOSE 993387EXPOSE 983388EXPOSE 4033389EXPOSE 303339091CMD export NVM_DIR="$HOME/.nvm" && \92    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \93    cd /polkadot-launch && \94    yarn start launch-config.json
modified.docker/Dockerfile-parachain-v2diffbeforeafterboth
--- a/.docker/Dockerfile-parachain-v2
+++ b/.docker/Dockerfile-parachain-v2
@@ -34,10 +34,12 @@
 RUN mkdir unique_parachain
 WORKDIR /unique_parachain
 
-ARG PROFILE='features=quartz-runtime --release'
+ARG PROFILE='features=quartz-runtime'
+
+ENV PROFILE $PROFILE
 
 COPY . .
-RUN cargo build --features=quartz-runtime --release
+RUN cargo build --$PROFILE
    # && \
    # cargo test
 
@@ -56,7 +58,6 @@
 
 FROM phusion/baseimage:focal-1.1.0
 
-#ARG PROFILE='--features=quartz-runtime --release'
 
 RUN apt-get -y update && \
       apt-get -y upgrade && \
modified.docker/docker-compose-tests-parachain.ymldiffbeforeafterboth
--- a/.docker/docker-compose-tests-parachain.yml
+++ b/.docker/docker-compose-tests-parachain.yml
@@ -3,26 +3,26 @@
 services:
   blockchain_nodes:
     build:
-      context: ./
-      dockerfile: Dockerfile-parachain
+      context: ../
+      dockerfile: .docker/Dockerfile-parachain
       args:
         - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
         - RUST_C=${RUST_C:?err}
         - POLKA_VERSION=${POLKA_VERSION:?err}
-        - UNIQUE_BRANCH=${UNIQUE_BRANCH:?err}
+        - FEATURE=${FEATURE:?err}
     volumes:
       - ./launch-config.json:/polkadot-launch/launch-config.json
     env_file:
       - ./.env
 
-  integration_tests:
-    build:
-      context: tests/
-      dockerfile: Dockerfile-tests
-    environment:
-      RPC_URL: http://blockchain_nodes:9933/
-    volumes:
-      - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
-      - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
-    depends_on:
-      - blockchain_nodes
+#  integration_tests:
+#    build:
+#      context: tests/
+#      dockerfile: Dockerfile-tests
+#    environment:
+#      RPC_URL: http://blockchain_nodes:9933/
+#    volumes:
+#      - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
+#      - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
+#    depends_on:
+#      - blockchain_nodes
added.docker/docker-compose.tmp-master.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose.tmp-master.j2
@@ -0,0 +1,10 @@
+version: "3.5"
+
+services:
+  blockchain_nodes:
+    build:
+      args:
+        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+        - "BRANCH={{ BRANCH }}"
+        - "REPO_URL={{ REPO_URL }}"
+        - "FEATURE={{ FEATURE }}"
modified.docker/docker-compose.tmp.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -1,7 +1,7 @@
 version: "3.5"
 
 services:
-  node-o:
+  blockchain_nodes:
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
@@ -10,4 +10,3 @@
         - "FEATURE={{ FEATURE }}"
 
     command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
-
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -72,7 +72,7 @@
       - name: Generate ENV related extend file for docker-compose
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: .docker/docker-compose.tmp.j2
+          template: .docker/docker-compose.tmp-master.j2
           output_file: .docker/docker-compose.${{ matrix.network }}.yml
           variables: |
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
@@ -84,7 +84,7 @@
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
+        run: docker-compose -f ".docker/docker-compose-tests-parachain.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
 
 #      - name: "Build the Docker image with Feature: ${{ env.features }}"
 #        run: docker build -t build-${{ github.head_ref }} --file .docker/Dockerfile-chain-dev --build-arg REPO_URL=${{ github.server_url }}/${{ github.repository }}.git --build-arg RUST_TOOLCHAIN=${{ env.actual_toolchain }} --build-arg FEATURE="${{ env.features }}" --build-arg BRANCH=${{ github.head_ref }} --no-cache .