From 346ac72031371f3528a3596c73ef62080655c238 Mon Sep 17 00:00:00 2001
From: Justin <pendo324@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:29:50 -0400
Subject: [PATCH] ci(fix): fix test steps for real this time (#1107)

Signed-off-by: Justin Alvarez <alvajus@amazon.com>
---
 .github/workflows/ci-docs.yaml  | 47 ++++++++++++---------------------
 .github/workflows/ci.yaml       | 10 ++++---
 .github/workflows/e2e-docs.yaml |  7 ++---
 3 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci-docs.yaml b/.github/workflows/ci-docs.yaml
index 00c08990b..0f647723b 100644
--- a/.github/workflows/ci-docs.yaml
+++ b/.github/workflows/ci-docs.yaml
@@ -17,8 +17,9 @@ on:
       - 'contrib/**'
       - '!contrib/packaging/**'
       - '.github/**'
-      - '!.github/workflows/ci.yaml'
-      - '!.github/workflows/e2e-*.yaml'
+      - '!.github/workflows/e2e-macos.yaml'
+      - '!.github/workflows/e2e-windows.yaml'
+      - '!.github/workflows/e2e-linux.yaml'
   pull_request:
     branches:
       - main
@@ -27,8 +28,9 @@ on:
       - 'contrib/**'
       - '!contrib/packaging/**'
       - '.github/**'
-      - '!.github/workflows/ci.yaml'
-      - '!.github/workflows/e2e-*.yaml'
+      - '!.github/workflows/e2e-macos.yaml'
+      - '!.github/workflows/e2e-windows.yaml'
+      - '!.github/workflows/e2e-linux.yaml'
 
 jobs:
   git-secrets:
@@ -80,41 +82,26 @@ jobs:
   macos-e2e-tests:
     strategy:
       matrix:
-        os:
-          [
-            [13, test-e2e-container, X64, test],
-            [13, test-e2e-container, arm64, test],
-            [13, test-e2e-vm-serial, X64, test],
-            [13, test-e2e-vm-serial, arm64, test],
-            [14, test-e2e-container, X64, test],
-            [14, test-e2e-container, arm64, test],
-            [14, test-e2e-vm-serial, X64, test],
-            [14, test-e2e-vm-serial, arm64, test],
-          ]
+        version: ['13', '14']
+        test-command: ['test-e2e-vm-serial', 'test-e2e-container']
+        arch: ['X64', 'arm64']
+        runner-type: ['test']
     uses: ./.github/workflows/e2e-docs.yaml
-    with:
-      os: ${{ matrix.os }}
   windows-e2e-tests:
     strategy:
       matrix:
-        os:
-          [[test-e2e-container, amd64, test], [test-e2e-vm-serial, amd64, test]]
+        test-command: ['test-e2e-vm-serial', 'test-e2e-container']
+        arch: ['amd64']
+        runner-type: ['test']
     uses: ./.github/workflows/e2e-docs.yaml
-    with:
-      os: ${{ matrix.os }}
   linux-e2e-tests:
     strategy:
       matrix:
-        os:
-          [
-            [amazonlinux, X64, 2, test],
-            [amazonlinux, X64, 2023, test],
-            [amazonlinux, arm64, 2, test],
-            [amazonlinux, arm64, 2023, test],
-          ]
+        os: ['amazonlinux']
+        arch: ['X64', 'arm64']
+        version: ['2023', '2']
+        runner-type: ['test']
     uses: ./.github/workflows/e2e-docs.yaml
-    with:
-      os: ${{ matrix.os }}
   mdlint:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 140b82ea5..3452e838b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,8 +9,9 @@ on:
       - '**.go'
       - 'go.mod'
       - 'go.sum'
-      - '.github/workflows/ci.yaml'
-      - '.github/workflows/e2e-*.yaml'
+      - '.github/workflows/e2e-macos.yaml'
+      - '.github/workflows/e2e-windows.yaml'
+      - '.github/workflows/e2e-linux.yaml'
       - 'contrib/packaging/**'
       - '!contrib/hello-finch/**'
   pull_request:
@@ -20,8 +21,9 @@ on:
       - '**.go'
       - 'go.mod'
       - 'go.sum'
-      - '.github/workflows/ci.yaml'
-      - '.github/workflows/e2e-*.yaml'
+      - '.github/workflows/e2e-macos.yaml'
+      - '.github/workflows/e2e-windows.yaml'
+      - '.github/workflows/e2e-linux.yaml'
       - 'contrib/packaging/**'
       - '!contrib/hello-finch/**'
   workflow_dispatch:
diff --git a/.github/workflows/e2e-docs.yaml b/.github/workflows/e2e-docs.yaml
index 8582de22d..62e7128e0 100644
--- a/.github/workflows/e2e-docs.yaml
+++ b/.github/workflows/e2e-docs.yaml
@@ -1,13 +1,10 @@
 name: e2e-docs
 on:
   workflow_call:
-    inputs:
-      os:
-        type: string
-        required: true
+
 jobs:
   test:
-    runs-on: ['self-hosted', '${{ fromJson(inputs.os) }}']
+    runs-on: ubuntu-latest
     steps:
       - name: Skip
         run: |