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
106          node-version: 16106          node-version: 16
107107
108      - name: Build the stack108      - name: Build the stack
109        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 300109        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300
110110
111      #  🚀 POLKADOT LAUNCH COMPLETE 🚀111      #  🚀 POLKADOT LAUNCH COMPLETE 🚀
112      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.112      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
355355
356      - name: Stop running containers356      - name: Stop running containers
357        if: always()                   # run this step always357        if: always()                   # run this step always
358        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes358        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
359359
360      - name: Remove builder cache360      - name: Remove builder cache
361        if: always()                   # run this step always361        if: always()                   # run this step always