From dd0370d46d02e6c1957253fb8ae9bc09bae4a22b Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Wed, 26 Jun 2024 10:52:13 -0700
Subject: [PATCH] Move test-compat to GHA

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/e2e.yaml | 5 ++++-
 scripts/test               | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 65f7a61e2755..80f4af12cc8a 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -7,6 +7,7 @@ on:
       - "install.sh"
       - "tests/**"
       - "!tests/e2e**"
+      - "!tests/docker**"
       - ".github/**"
       - "!.github/workflows/e2e.yaml"
   pull_request:
@@ -16,6 +17,7 @@ on:
       - "install.sh"
       - "tests/**"
       - "!tests/e2e**"
+      - "!tests/docker**"
       - ".github/**"
       - "!.github/workflows/e2e.yaml"
   workflow_dispatch: {}
@@ -97,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dtest: [basics, bootstraptoken, cacerts, lazypull, upgrade]
+        dtest: [basics, bootstraptoken, cacerts, compat, lazypull, upgrade]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -113,6 +115,7 @@ jobs:
     - name: Run ${{ matrix.dtest }} Test
       run: | 
         chmod +x ./dist/artifacts/k3s
+        . ./scripts/version.sh
         . ./tests/docker/test-helpers
         . ./tests/docker/test-run-${{ matrix.dtest }}
         echo "Did test-run-${{ matrix.dtest }} pass $?"
diff --git a/scripts/test b/scripts/test
index 684e1398003e..42d64a1330ae 100755
--- a/scripts/test
+++ b/scripts/test
@@ -29,6 +29,9 @@ if [ "$ARCH" != 'amd64' ]; then
   . ./tests/docker/test-run-cacerts
   echo "Did test-run-cacerts $?"
 
+  . ./tests/docker/test-run-compat
+  echo "Did test-run-compat $?"
+
   . ./tests/docker/test-run-bootstraptoken
   echo "Did test-run-bootstraptoken $?"
 
@@ -39,8 +42,7 @@ if [ "$ARCH" != 'amd64' ]; then
   echo "Did test-run-lazypull $?"
 fi
 
-. ./tests/docker/test-run-compat
-echo "Did test-run-compat $?"
+
 
 . ./tests/docker/test-run-hardened
 echo "Did test-run-hardened $?"