From b6148c8f444a7b737728a087464d4b04ad6d0fc8 Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Fri, 6 Sep 2024 13:40:30 -0700
Subject: [PATCH] Switch to docker arm64 tests instead of integration tests

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/e2e.yaml         | 35 +++++++++++++++++++++++++++++
 .github/workflows/integration.yaml | 36 ------------------------------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 80f4af12cc8a..f8b88ef1a733 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -30,6 +30,12 @@ jobs:
     uses: ./.github/workflows/build-k3s.yaml
     with:
       upload-image: true
+  build-arm64:
+    if : github.repository == 'k3s-io/k3s'
+    uses: ./.github/workflows/build-k3s.yaml
+    with:
+      arch: oracle-aarch64-4cpu-16gb
+      upload-image: true
   e2e:
     name: "E2E Tests"
     needs: build
@@ -119,3 +125,32 @@ jobs:
         . ./tests/docker/test-helpers
         . ./tests/docker/test-run-${{ matrix.dtest }}
         echo "Did test-run-${{ matrix.dtest }} pass $?"
+  docker-arm64:
+    needs: build-arm64
+    name: Docker Tests Arm64
+    if: github.repository == 'k3s-io/k3s'
+    runs-on: oracle-aarch64-4cpu-16gb
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        dtest: [basics, bootstraptoken, cacerts, compat, lazypull, upgrade]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: "Download k3s image"
+      uses: actions/download-artifact@v4
+      with:
+        name: k3s-arm64
+        path: ./dist/artifacts
+    - name: Load k3s image
+      run: docker image load -i ./dist/artifacts/k3s-image.tar
+    - 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 $?"
\ No newline at end of file
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 5beeef0a16f2..66a8dc1f22d5 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -30,42 +30,6 @@ env:
 jobs:
   build:
     uses: ./.github/workflows/build-k3s.yaml
-  build-arm64:
-    if : github.repository == 'k3s-io/k3s'
-    uses: ./.github/workflows/build-k3s.yaml
-    with:
-      arch: oracle-aarch64-4cpu-16gb
-  itest-arm64:
-    needs: build-arm64
-    name: Integration Tests Arm64
-    if: github.repository == 'k3s-io/k3s'
-    runs-on: oracle-aarch64-4cpu-16gb
-    strategy:
-      fail-fast: false
-      matrix:
-        itest: [certrotation, localstorage, startup, custometcdargs, kubeflags, secretsencryption, flannelnone]
-      max-parallel: 3
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-    - name: Install Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: 'go.mod' 
-        cache: false
-    - name: "Download k3s binary"
-      uses: actions/download-artifact@v4
-      with:
-        name: k3s-arm64
-        path: ./dist/artifacts
-    - name: Run Integration Tests
-      run: |
-        mv ./dist/artifacts/k3s-arm64 ./dist/artifacts/k3s
-        chmod +x ./dist/artifacts/k3s
-        mkdir -p $GOCOVERDIR
-        sudo -E env "PATH=$PATH" go test -v -timeout=45m ./tests/integration/${{ matrix.itest }}/... -run Integration
   itest:
     needs: build
     name: Integration Tests