From 6ebf21f50aa497caa4ea81b3b7e8c4a8ae4e12a4 Mon Sep 17 00:00:00 2001
From: Craig O'Donnell <craig@replicated.com>
Date: Tue, 3 Oct 2023 10:48:19 -0400
Subject: [PATCH] fix reusable action for testing

---
 .github/workflows/build-test.yaml          | 26 +++++++++++++++-
 .github/workflows/compatibility-tests.yaml | 36 ++++++++++++----------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index e61f7b4d10..1e9bb337e8 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -600,10 +600,34 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           allow-repeats: false
 
+  
+  cmx-versions:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: get CMX versions to test
+        id: cmx-versions-to-test
+        uses: ./.github/actions/cmx-versions
+        with:
+          replicated-api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
+    outputs:
+      versions-to-test: ${{ steps.cmx-versions-to-test.outputs.versions-to-test }}
+
         
   validate-compatibility-tests:
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite, cmx-versions ]
     uses: ./.github/workflows/compatibility-tests.yaml
+    with:
+      versions-to-test: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    secrets:
+      TESTIM_ACCESS_TOKEN: ${{ secrets.TESTIM_ACCESS_TOKEN }}
+      E2E_SUPPORT_BUNDLE_AWS_ACCESS_KEY_ID: ${{ secrets.E2E_SUPPORT_BUNDLE_AWS_ACCESS_KEY_ID }}
+      E2E_SUPPORT_BUNDLE_AWS_SECRET_ACCESS_KEY: ${{ secrets.E2E_SUPPORT_BUNDLE_AWS_SECRET_ACCESS_KEY }}
+      C11Y_MATRIX_TOKEN: ${{ secrets.C11Y_MATRIX_TOKEN }}
+      E2E_DOCKERHUB_USERNAME: ${{ secrets.E2E_DOCKERHUB_USERNAME }}
+      E2E_DOCKERHUB_PASSWORD: ${{ secrets.E2E_DOCKERHUB_PASSWORD }}
 
 
   # validate-existing-online-install-minimal:
diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml
index 8d16a280ae..b31becc5d3 100644
--- a/.github/workflows/compatibility-tests.yaml
+++ b/.github/workflows/compatibility-tests.yaml
@@ -2,30 +2,32 @@ name: compatibility-tests
 
 on:
   workflow_call:
+    inputs:
+      versions-to-test:
+        type: string
+        required: true
+        description: 'CMX versions to test'
+    secrets:
+      C11Y_MATRIX_TOKEN:
+        required: true
+      TESTIM_ACCESS_TOKEN:
+        required: true
+      E2E_SUPPORT_BUNDLE_AWS_ACCESS_KEY_ID:
+        required: true
+      E2E_SUPPORT_BUNDLE_AWS_SECRET_ACCESS_KEY:
+        required: true
+      E2E_DOCKERHUB_USERNAME:
+        required: true
+      E2E_DOCKERHUB_PASSWORD:
+        required: true
 
 jobs:
-  cmx-versions:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: get CMX versions to test
-        id: cmx-versions-to-test
-        uses: ./.github/actions/cmx-versions
-        with:
-          replicated-api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
-    outputs:
-      versions-to-test: ${{ steps.cmx-versions-to-test.outputs.versions-to-test }}
-
-
   validate-smoke-test:
     runs-on: ubuntu-20.04
-    needs: [ cmx-versions ]
     strategy:
       fail-fast: false
       matrix:
-        cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+        cluster: ${{ fromJson(inputs.versions-to-test) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3