fix(ci): pre-pull compose images to avoid timeouts

Signed-off-by: Victor Adossi <[email protected]>
wasmCloud · Oct 4, 2024 · 4d5998e · 4d5998e
1 parent d4df73e
commit 4d5998e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -13,8 +13,8 @@ jobs:
  fail-fast: false
  matrix:
  # TODO: Re-enable the multitenant and upgrades tests in followup to #247
- # e2e_test: [e2e_multiple_hosts, e2e_multitenant, e2e_upgrades]
- e2e_test: [e2e_multiple_hosts, e2e_upgrades]
+ # test: [e2e_multiple_hosts, e2e_multitenant, e2e_upgrades]
+ test: [e2e_multiple_hosts, e2e_upgrades]
 
  steps:
  - uses: actions/checkout@v4
@@ -30,19 +30,26 @@ jobs:
  with:
  key: 'ubuntu-22.04-rust-cache'
 
+ # If the test uses a docker compose file, pre-emptively pull images used in docker compose
+ - name: Pull images for test ${{ matrix.test }}
+ shell: bash
+ run: |
+ export DOCKER_COMPOSE_FILE=tests/docker-compose-${{ matrix.test }}.yaml;
+ [[ -f "$DOCKER_COMPOSE_FILE" ]] && docker compose -f $DOCKER_COMPOSE_FILE pull;
+
  # Run e2e tests in a matrix for efficiency
- - name: Run tests ${{ matrix.e2e_test }}
+ - name: Run tests ${{ matrix.test }}
  id: test
  env:
- WADM_E2E_TEST: ${{ matrix.e2e_test }}
+ WADM_TEST: ${{ matrix.test }}
  run: make test-individual-e2e
 
  # if the previous step fails, upload logs
  - name: Upload logs for debugging
  uses: actions/upload-artifact@v4
  if: ${{ failure() && steps.test.outcome == 'failure' }}
  with:
- name: e2e-logs-${{ matrix.e2e_test }}
+ name: e2e-logs-${{ matrix.test }}
  path: ./tests/e2e_log/*
  # Be nice and only retain the logs for 7 days
  retention-days: 7
diff --git a/tests/docker-compose-e2e.yaml → tests/docker-compose-e2e_multiple_hosts.yaml b/tests/docker-compose-e2e.yaml → tests/docker-compose-e2e_multiple_hosts.yaml
diff --git a/tests/docker-compose-e2e-multitenant.yaml → tests/docker-compose-e2e_multitenant.yaml b/tests/docker-compose-e2e-multitenant.yaml → tests/docker-compose-e2e_multitenant.yaml
diff --git a/tests/docker-compose-e2e-upgrade.yaml → tests/docker-compose-e2e_upgrades.yaml b/tests/docker-compose-e2e-upgrade.yaml → tests/docker-compose-e2e_upgrades.yaml
diff --git a/tests/e2e_multiple_hosts.rs b/tests/e2e_multiple_hosts.rs
@@ -20,7 +20,7 @@ use crate::{
 };
 
 const MANIFESTS_PATH: &str = "tests/fixtures/manifests";
-const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e.yaml";
+const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e_multiple_hosts.yaml";
 const BLOBSTORE_FS_IMAGE_REF: &str = "ghcr.io/wasmcloud/blobstore-fs:0.6.0";
 const BLOBSTORE_FS_PROVIDER_ID: &str = "fileserver";
 const BLOBBY_IMAGE_REF: &str = "ghcr.io/wasmcloud/components/blobby-rust:0.4.0";

diff --git a/tests/e2e_multitenant.rs b/tests/e2e_multitenant.rs
@@ -15,7 +15,7 @@
 // use crate::e2e::check_status;
 
 // const MANIFESTS_PATH: &str = "tests/fixtures/manifests";
-// const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e-multitenant.yaml";
+// const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e_multitenant.yaml";
 
 // const MESSAGE_PUB_ACTOR_ID: &str = "MC3QONHYH3FY4KYFCOSVJWIDJG4WA2PVD6FHKR7FFT457GVUTZJYR2TJ";
 // const NATS_PROVIDER_ID: &str = "VADNMSIML2XGO2X4TPIONTIC55R2UUQGPPDZPAVSC2QD7E76CR77SPW7";

diff --git a/tests/e2e_upgrades.rs b/tests/e2e_upgrades.rs
@@ -17,7 +17,7 @@ use e2e::{
 use helpers::{HELLO_COMPONENT_ID, HELLO_IMAGE_REF, HTTP_SERVER_COMPONENT_ID};
 
 const MANIFESTS_PATH: &str = "tests/fixtures/manifests";
-const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e-upgrade.yaml";
+const DOCKER_COMPOSE_FILE: &str = "tests/docker-compose-e2e_upgrades.yaml";
 const KEYVALUE_REDIS_COMPONENT_ID: &str = "keyvalue_redis";
 const DOG_FETCHER_GENERATED_ID: &str = "dog_fetcher";
 const KVCOUNTER_GENERATED_ID: &str = "kvcounter";