WIP fixing pipelines

Cardinal-Cryptography · Nov 4, 2022 · ab0b2e5 · ab0b2e5
1 parent 31f7e96
commit ab0b2e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/scripts/run_consensus.sh b/.github/scripts/run_consensus.sh
@@ -6,6 +6,7 @@ set -euo pipefail
 # change when increasing the number of node containers
 NODE_COUNT=5
 MIN_VALIDATOR_COUNT=4
+DOCKER_COMPOSE=${DOCKER_COMPOSE:-"docker/docker-compose.yml"}
 OVERRIDE_DOCKER_COMPOSE=${OVERRIDE_DOCKER_COMPOSE:-""}
 
 # default minimum validator count
@@ -83,19 +84,20 @@ function generate_bootnode_peer_id {
 
 function run_containers {
   local authorities_count="$1"
-  local override_file="$2"
+  local docker_compose_file="$2"
+  local override_file="$3"
 
   echo "Running ${authorities_count} containers..."
   if [[ -z ${override_file} ]]; then
-      docker-compose -f docker/docker-compose.yml up -d
+      docker-compose -f "${docker_compose_file}" up -d
   else
-      docker-compose -f docker/docker-compose.yml -f "${override_file}" up -d
+      docker-compose -f "${docker_compose_file}" -f "${override_file}" up -d
   fi
 }
 
 authorities=$(generate_authorities ${NODE_COUNT})
 generate_chainspec "${authorities[@]}" "${MIN_VALIDATOR_COUNT}"
 generate_bootnode_peer_id ${authorities[0]}
-run_containers ${NODE_COUNT} "${OVERRIDE_DOCKER_COMPOSE}"
+run_containers ${NODE_COUNT} "${DOCKER_COMPOSE}" "${OVERRIDE_DOCKER_COMPOSE}"
 
 exit $?
diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml
@@ -543,7 +543,7 @@ jobs:
       - name: Call catchup_test.sh
         run: |
           chmod +x ./scripts/catchup_version_upgrade_test.sh
-          UPGRADE_ROUND=31 NODES="Node1" PORTS="9934" EXT_STATUS=finalized ./scripts/catchup_version_upgrade_test.sh
+          UPGRADE_ROUND=31 NODES="Node1" PORTS="9934" EXT_STATUS=finalized DOCKER_COMPOSE=docker/docker-compose.bridged.yml ./scripts/catchup_version_upgrade_test.sh
 
   run-e2e-version-upgrade-catchup-two-late:
     needs: [build-test-docker, build-cliain-image]
@@ -577,7 +577,7 @@ jobs:
       - name: Call catchup_test.sh
         run: |
           chmod +x ./scripts/catchup_version_upgrade_test.sh
-          UPGRADE_ROUND=31 NODES="Node1:Node2" PORTS="9934:9935" EXT_STATUS="in-block" ./scripts/catchup_version_upgrade_test.sh
+          UPGRADE_ROUND=31 NODES="Node1:Node2" PORTS="9934:9935" EXT_STATUS="in-block" DOCKER_COMPOSE=docker/docker-compose.bridged.yml ./scripts/catchup_version_upgrade_test.sh
 
   run-e2e-version-upgrade-early-catchup-one-late:
     needs: [build-test-docker, build-cliain-image]
@@ -611,7 +611,7 @@ jobs:
       - name: Call catchup_test.sh
         run: |
           chmod +x ./scripts/catchup_version_upgrade_test.sh
-          UPGRADE_BEFORE_DISABLE=true UPGRADE_ROUND=31 NODES="Node1" PORTS="9934" EXT_STATUS=finalized ./scripts/catchup_version_upgrade_test.sh
+          UPGRADE_BEFORE_DISABLE=true UPGRADE_ROUND=31 NODES="Node1" PORTS="9934" EXT_STATUS=finalized DOCKER_COMPOSE=docker/docker-compose.bridged.yml ./scripts/catchup_version_upgrade_test.sh
 
   run-e2e-version-upgrade-early-catchup-two-late:
     needs: [build-test-docker, build-cliain-image]
@@ -645,7 +645,7 @@ jobs:
       - name: Call catchup_test.sh
         run: |
           chmod +x ./scripts/catchup_version_upgrade_test.sh
-          UPGRADE_BEFORE_DISABLE=true UPGRADE_ROUND=31 NODES="Node1:Node2" PORTS="9934:9935" EXT_STATUS="in-block" ./scripts/catchup_version_upgrade_test.sh
+          UPGRADE_BEFORE_DISABLE=true UPGRADE_ROUND=31 NODES="Node1:Node2" PORTS="9934:9935" EXT_STATUS="in-block" DOCKER_COMPOSE=docker/docker-compose.bridged.yml ./scripts/catchup_version_upgrade_test.sh
 
   check-e2e-test-suite-completion:
     needs: [