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

no changes

modified.docker/Dockerfile-parachaindiffbeforeafterboth
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ARG RUST_TOOLCHAIN=nightly-2022-05-115ARG RUST_TOOLCHAIN=nightly-2022-05-11
6#ARG RUST_C=1.62.0-nightly
7ARG POLKA_VERSION=release-v0.9.246ARG POLKA_VERSION=release-v0.9.24
8ARG UNIQUE_BRANCH=develop
97
10#ARG USER=***
11#ARG PASS=***
128
13
14ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN9ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
15#ENV RUST_C $RUST_C
16ENV POLKA_VERSION $POLKA_VERSION10ENV POLKA_VERSION $POLKA_VERSION
17ENV UNIQUE_BRANCH $UNIQUE_BRANCH
1811
19
20#RUN echo $RUST_TOOLCHAIN
21#RUN echo $RUST_C
22#RUN echo $POLKA_VERSION
23#RUN echo $UNIQUE_BRANCH
24
25ENV CARGO_HOME="/cargo-home"12ENV CARGO_HOME="/cargo-home"
26ENV PATH="/cargo-home/bin:$PATH"13ENV PATH="/cargo-home/bin:$PATH"
2714
38 rustup show25 rustup show
39RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
4027
41RUN cargo install cargo-chef28####works inside repo folder###
4229
43RUN mkdir unique_parachain
44WORKDIR /unique_parachain
4530
46# ===== Chef =====
47FROM rust-builder as chef
48
49COPY . .
50RUN cargo chef prepare --recipe-path recipe.json
51
52# ===== BUILD ======31# ===== BUILD ======
53FROM rust-builder as builder32FROM rust-builder as builder-unique
5433
55RUN mkdir unique_parachain34RUN mkdir unique_parachain
56WORKDIR /unique_parachain35WORKDIR /unique_parachain
5736
58COPY --from=chef /unique_parachain/recipe.json recipe.json
59ARG PROFILE=release37ARG FEATURE='--release'
60RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json
6138
62COPY . .39COPY . .
63RUN cargo build "--$PROFILE"40RUN cargo build $FEATURE
64 # && \41 # && \
65 # cargo test42 # cargo test
6643
7956
80FROM phusion/baseimage:focal-1.1.057FROM phusion/baseimage:focal-1.1.0
8158
82ARG PROFILE=release
83
84RUN apt-get -y update && \59RUN apt-get -y update && \
85 apt-get -y upgrade && \60 apt-get -y upgrade && \
86 apt-get -y install curl git && \61 apt-get -y install curl git && \
90 nvm install v15.5.0 && \65 nvm install v15.5.0 && \
91 nvm use v15.5.066 nvm use v15.5.0
9267
93RUN git clone https://github.com/paritytech/polkadot-launch68RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \
69 cd /polkadot-launch && \
70 git checkout feature/runtime-upgrade-testing
9471
95RUN export NVM_DIR="$HOME/.nvm" && \72RUN export NVM_DIR="$HOME/.nvm" && \
96 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
97 cd /polkadot-launch && \74 cd /polkadot-launch && \
98 npm install --global yarn && \75 npm install --global yarn && \
99 yarn76 yarn
77
78COPY --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/
80
81COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]
10082
101COPY --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/
10383
104EXPOSE 984484EXPOSE 9844
105EXPOSE 994485EXPOSE 9944
modified.docker/Dockerfile-parachain-v2diffbeforeafterboth
34RUN mkdir unique_parachain34RUN mkdir unique_parachain
35WORKDIR /unique_parachain35WORKDIR /unique_parachain
3636
37ARG PROFILE='features=quartz-runtime --release'37ARG PROFILE='features=quartz-runtime'
3838
39ENV PROFILE $PROFILE
40
39COPY . .41COPY . .
40RUN cargo build --features=quartz-runtime --release42RUN cargo build --$PROFILE
41 # && \43 # && \
42 # cargo test44 # cargo test
4345
5658
57FROM phusion/baseimage:focal-1.1.059FROM phusion/baseimage:focal-1.1.0
5860
59#ARG PROFILE='--features=quartz-runtime --release'
6061
61RUN apt-get -y update && \62RUN apt-get -y update && \
62 apt-get -y upgrade && \63 apt-get -y upgrade && \
modified.docker/docker-compose-tests-parachain.ymldiffbeforeafterboth
3services:3services:
4 blockchain_nodes:4 blockchain_nodes:
5 build:5 build:
6 context: ./6 context: ../
7 dockerfile: Dockerfile-parachain7 dockerfile: .docker/Dockerfile-parachain
8 args:8 args:
9 - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}9 - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
10 - RUST_C=${RUST_C:?err}10 - RUST_C=${RUST_C:?err}
11 - POLKA_VERSION=${POLKA_VERSION:?err}11 - POLKA_VERSION=${POLKA_VERSION:?err}
12 - UNIQUE_BRANCH=${UNIQUE_BRANCH:?err}12 - FEATURE=${FEATURE:?err}
13 volumes:13 volumes:
14 - ./launch-config.json:/polkadot-launch/launch-config.json14 - ./launch-config.json:/polkadot-launch/launch-config.json
15 env_file:15 env_file:
16 - ./.env16 - ./.env
1717
18 integration_tests:18# integration_tests:
19 build:19# build:
20 context: tests/20# context: tests/
21 dockerfile: Dockerfile-tests21# dockerfile: Dockerfile-tests
22 environment:22# environment:
23 RPC_URL: http://blockchain_nodes:9933/23# RPC_URL: http://blockchain_nodes:9933/
24 volumes:24# volumes:
25 - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts25# - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
26 - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report26# - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
27 depends_on:27# depends_on:
28 - blockchain_nodes28# - blockchain_nodes
2929
added.docker/docker-compose.tmp-master.j2diffbeforeafterboth

no changes

modified.docker/docker-compose.tmp.j2diffbeforeafterboth
1version: "3.5"1version: "3.5"
22
3services:3services:
4 node-o:4 blockchain_nodes:
5 build:5 build:
6 args:6 args:
7 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"7 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
10 - "FEATURE={{ FEATURE }}"10 - "FEATURE={{ FEATURE }}"
1111
12 command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external12 command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
13
1413
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
72 - name: Generate ENV related extend file for docker-compose72 - name: Generate ENV related extend file for docker-compose
73 uses: cuchi/jinja2-action@v1.2.073 uses: cuchi/jinja2-action@v1.2.0
74 with:74 with:
75 template: .docker/docker-compose.tmp.j275 template: .docker/docker-compose.tmp-master.j2
76 output_file: .docker/docker-compose.${{ matrix.network }}.yml76 output_file: .docker/docker-compose.${{ matrix.network }}.yml
77 variables: |77 variables: |
78 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git78 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
84 run: cat .docker/docker-compose.${{ matrix.network }}.yml84 run: cat .docker/docker-compose.${{ matrix.network }}.yml
8585
86 - name: Build the stack86 - name: Build the stack
87 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build87 run: docker-compose -f ".docker/docker-compose-tests-parachain.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
8888
89# - name: "Build the Docker image with Feature: ${{ env.features }}"89# - name: "Build the Docker image with Feature: ${{ env.features }}"
90# 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 .90# 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 .