add export, wait for verify-build in tests

terascope · Jul 12, 2024 · 3787987 · 3787987
1 parent 1d4eb7c
commit 3787987
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -90,6 +90,7 @@ jobs:
 
   linux-unit-tests:
     runs-on: ubuntu-latest
+    needs: verify-build
     strategy:
       matrix:
         node-version: [18.19.1, 20.11.1, 22.2.0]
@@ -113,6 +114,7 @@ jobs:
 
   linux-unit-esm-tests:
     runs-on: ubuntu-latest
+    needs: verify-build
     strategy:
       matrix:
         node-version: [18.19.1, 20.11.1, 22.2.0]
@@ -197,7 +199,7 @@ jobs:
 
   elasticsearch-store-tests:
     runs-on: ubuntu-latest
-    needs: cache-docker-images
+    needs: [verify-build, cache-docker-images]
     strategy:
       # opensearch is finiky, keep testing others if it fails
       fail-fast: false
@@ -256,7 +258,7 @@ jobs:
 
   elasticsearch-api-tests:
     runs-on: ubuntu-latest
-    needs: cache-docker-images
+    needs: [verify-build, cache-docker-images]
     strategy:
       # opensearch is finiky, keep testing others if it fails
       fail-fast: false
@@ -445,7 +447,7 @@ jobs:
 
   e2e-k8s-v2-tests:
     runs-on: ubuntu-latest
-    needs: cache-docker-images
+    needs: [verify-build, cache-docker-images]
     strategy:
       # opensearch is finiky, keep testing others if it fails
       fail-fast: false
@@ -512,7 +514,7 @@ jobs:
 
   e2e-external-storage-tests:
     runs-on: ubuntu-latest
-    needs: cache-docker-images
+    needs: [verify-build, cache-docker-images]
     strategy:
       # opensearch is finiky, keep testing others if it fails
       fail-fast: false
@@ -574,7 +576,7 @@ jobs:
 
   e2e-external-storage-tests-encrypted:
     runs-on: ubuntu-latest
-    needs: cache-docker-images
+    needs: [verify-build, cache-docker-images]
     strategy:
       # opensearch is finiky, keep testing others if it fails
       fail-fast: false

diff --git a/packages/scripts/src/helpers/test-runner/index.ts b/packages/scripts/src/helpers/test-runner/index.ts
@@ -285,6 +285,8 @@ async function runE2ETest(
         tracker.addError(err);
     }
 
+    await deleteDockerImageCache();
+
     if (!tracker.hasErrors()) {
         const timeLabel = `test suite "${suite}"`;
         signale.time(timeLabel);

diff --git a/packages/scripts/src/helpers/test-runner/services.ts b/packages/scripts/src/helpers/test-runner/services.ts
@@ -820,7 +820,6 @@ async function startService(options: TestOptions, service: Service): Promise<()
     if (options.testPlatform === 'kubernetes' || options.testPlatform === 'kubernetesV2') {
         const kind = new Kind(options.k8sVersion, options.kindClusterName);
         await kind.loadServiceImage(service, services[service].image, version);
-        await deleteDockerImageCache();
         await k8sStopService(service);
         await k8sStartService(service, services[service].image, version, kind);
         return () => { };

diff --git a/packages/scripts/src/index.ts b/packages/scripts/src/index.ts
@@ -3,3 +3,4 @@ export * from './helpers/misc';
 export * from './helpers/scripts';
 export * from './helpers/interfaces';
 export * from './helpers/k8s-env/k8s';
+export * from './helpers/images';