difftreelog
merge override docker-compose files
in: master
12 files changed
.docker/docker-compose-dev.yamldiffbeforeafterboth--- a/.docker/docker-compose-dev.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.5"
-
-services:
- node-dev:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-chain-dev
- image: node-dev
- container_name: node-dev
.docker/docker-compose-forkless.ymldiffbeforeafterboth--- a/.docker/docker-compose-forkless.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3.5"
-
-services:
- node-parachain:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-parachain-upgrade
- image: node-parachain
- container_name: node-parachain
- volumes:
- - type: bind
- source: ./launch-config-forkless.json
- target: /polkadot-launch/launch-config.json
- read_only: true
- expose:
- - 9944
- - 9933
- ports:
- - 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
- logging:
- options:
- max-size: "1m"
- max-file: "3"
.docker/docker-compose-master.ymldiffbeforeafterboth--- a/.docker/docker-compose-master.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-parachain
- image: blockchain_nodes
- container_name: blockchain_nodes
- expose:
- - 9944
- - 9933
- ports:
- - 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
- logging:
- options:
- max-size: "1m"
- max-file: "3"
.docker/docker-compose-try-runtime.ymldiffbeforeafterboth--- a/.docker/docker-compose-try-runtime.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.5"
-
-services:
- try-runtime:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-try-runtime
- image: try-runtime
- container_name: try-runtime
- expose:
- - 9944
- - 9933
- ports:
- - 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
- logging:
- options:
- max-size: "1m"
- max-file: "3"
.docker/docker-compose.tmp-dev.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -8,6 +8,8 @@
- "NETWORK={{ NETWORK }}"
context: ../
dockerfile: .docker/Dockerfile-chain-dev
+ image: node-dev
+ container_name: node-dev
expose:
- 9944
- 9933
.docker/docker-compose.tmp-master.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-master.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- args:
- - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- - "BRANCH={{ BRANCH }}"
- - "REPO_URL={{ REPO_URL }}"
- - "NETWORK={{ NETWORK }}"
- - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
.docker/docker-compose.tmp-try-runtime.j2diffbeforeafterboth--- /dev/null
+++ b/.docker/docker-compose.tmp-try-runtime.j2
@@ -0,0 +1,23 @@
+version: "3.5"
+
+services:
+ try-runtime:
+ build:
+ context: ../
+ dockerfile: .docker/Dockerfile-try-runtime
+ args:
+ - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+ - "NETWORK={{ NETWORK }}"
+ - "REPLICA_FROM={{ REPLICA_FROM }}"
+ image: try-runtime
+ container_name: try-runtime
+ expose:
+ - 9944
+ - 9933
+ ports:
+ - 127.0.0.1:9944:9944
+ - 127.0.0.1:9933:9933
+ logging:
+ options:
+ max-size: "1m"
+ max-file: "3"
.docker/docker-compose.tmp-unit.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-unit.j2
+++ b/.docker/docker-compose.tmp-unit.j2
@@ -8,6 +8,8 @@
args:
- "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- "NETWORK={{ NETWORK }}"
+ image: node-dev
+ container_name: node-dev
logging:
options:
max-size: "1m"
.docker/docker-compose.try-runtime.j2diffbeforeafterboth--- a/.docker/docker-compose.try-runtime.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-version: "3.5"
-
-services:
- try-runtime:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-try-runtime
- args:
- - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- - "NETWORK={{ NETWORK }}"
- - "REPLICA_FROM={{ REPLICA_FROM }}"
- image: try-runtime
- container_name: try-runtime
- expose:
- - 9944
- - 9933
- ports:
- - 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
- logging:
- options:
- max-size: "1m"
- max-file: "3"
.github/workflows/try-runtime.ymldiffbeforeafterboth--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -41,7 +41,7 @@
- name: Generate ENV related extend file for docker-compose
uses: cuchi/jinja2-action@v1.2.0
with:
- template: .docker/docker-compose.try-runtime.j2
+ template: .docker/docker-compose.tmp-try-runtime.j2
output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
variables: |
RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
.github/workflows/unit-test.ymldiffbeforeafterboth--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -46,11 +46,11 @@
run: cat .docker/docker-compose.unit.yml
- name: Build the stack
- run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" up --build --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev
+ run: docker-compose -f ".docker/docker-compose.unit.yml" up --build --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev
- name: Stop running containers
if: always() # run this step always
- run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" down
+ run: docker-compose -f ".docker/docker-compose.unit.yml" down
- name: Remove builder cache
if: always() # run this step always
.github/workflows/yarn-dev.ymldiffbeforeafterboth1# Integration test in --dev mode2# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586411104/Integration+tests3name: yarn dev45# Triger: only call from main workflow(re-usable workflows)6on:7 workflow_call:891011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:13 14 dev_build_int_tests:15 # The type of runner that the job will run on16 runs-on: [self-hosted-ci,medium]17 timeout-minutes: 13801819 name: ${{ matrix.network }}2021 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.2223 strategy:24 matrix:25 include:26 - network: "opal"27 - network: "quartz"28 - network: "unique"2930 steps:3132 - name: Clean Workspace33 uses: AutoModality/action-clean@v1.1.03435 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it36 - uses: actions/checkout@v337 with:38 ref: ${{ github.head_ref }} #Checking out head commit3940 - name: Read .env file41 uses: xom9ikk/dotenv@v24243 - name: Generate ENV related extend file for docker-compose44 uses: cuchi/jinja2-action@v1.2.045 with:46 template: .docker/docker-compose.tmp-dev.j247 output_file: .docker/docker-compose.${{ matrix.network }}.yml48 variables: |49 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}50 NETWORK=${{ matrix.network }}51 5253 - name: Show build configuration54 run: cat .docker/docker-compose.${{ matrix.network }}.yml5556 - name: Build the stack57 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans5859 - uses: actions/setup-node@v360 with:61 node-version: 166263 - name: Run tests64 working-directory: tests65 run: |66 yarn install67 yarn add mochawesome68 node scripts/readyness.js69 echo "Ready to start tests"70 yarn polkadot-types71 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}72 env:73 RPC_URL: http://127.0.0.1:9933/7475 - name: Test Report76 uses: phoenix-actions/test-reporting@v877 id: test-report78 if: success() || failure() # run this step even if previous step failed79 with:80 name: int test results - ${{ matrix.network }} # Name of the check run which will be created81 path: tests/mochawesome-report/test-*.json # Path to test results82 reporter: mochawesome-json83 fail-on-error: 'false'8485 - name: Read output variables86 run: |87 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"8889 - name: Stop running containers90 if: always() # run this step always91 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down9293 - name: Remove builder cache94 if: always() # run this step always95 run: |96 docker builder prune -f -a97 docker system prune -f98 docker image prune -f -a1# Integration test in --dev mode2# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586411104/Integration+tests3name: yarn dev45# Triger: only call from main workflow(re-usable workflows)6on:7 workflow_call:891011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:13 14 dev_build_int_tests:15 # The type of runner that the job will run on16 runs-on: [self-hosted-ci,medium]17 timeout-minutes: 13801819 name: ${{ matrix.network }}2021 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.2223 strategy:24 matrix:25 include:26 - network: "opal"27 - network: "quartz"28 - network: "unique"2930 steps:3132 - name: Clean Workspace33 uses: AutoModality/action-clean@v1.1.03435 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it36 - uses: actions/checkout@v337 with:38 ref: ${{ github.head_ref }} #Checking out head commit3940 - name: Read .env file41 uses: xom9ikk/dotenv@v24243 - name: Generate ENV related extend file for docker-compose44 uses: cuchi/jinja2-action@v1.2.045 with:46 template: .docker/docker-compose.tmp-dev.j247 output_file: .docker/docker-compose.${{ matrix.network }}.yml48 variables: |49 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}50 NETWORK=${{ matrix.network }}51 5253 - name: Show build configuration54 run: cat .docker/docker-compose.${{ matrix.network }}.yml5556 - name: Build the stack57 run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans5859 - uses: actions/setup-node@v360 with:61 node-version: 166263 - name: Run tests64 working-directory: tests65 run: |66 yarn install67 yarn add mochawesome68 node scripts/readyness.js69 echo "Ready to start tests"70 yarn polkadot-types71 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}72 env:73 RPC_URL: http://127.0.0.1:9933/7475 - name: Test Report76 uses: phoenix-actions/test-reporting@v877 id: test-report78 if: success() || failure() # run this step even if previous step failed79 with:80 name: int test results - ${{ matrix.network }} # Name of the check run which will be created81 path: tests/mochawesome-report/test-*.json # Path to test results82 reporter: mochawesome-json83 fail-on-error: 'false'8485 - name: Read output variables86 run: |87 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"8889 - name: Stop running containers90 if: always() # run this step always91 run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" down9293 - name: Remove builder cache94 if: always() # run this step always95 run: |96 docker builder prune -f -a97 docker system prune -f98 docker image prune -f -a