Test arm runners

Signed-off-by: Derek Nola <[email protected]>
k3s-io · Nov 26, 2024 · 48a53f6 · 48a53f6
1 parent 8a14c97
commit 48a53f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/.github/workflows/build-k3s.yaml b/.github/workflows/build-k3s.yaml
@@ -57,9 +57,5 @@ jobs:
     - name: "Dump CPU info"
       run: |
         lscpu
-        lsmem
-    - name: "htop"
-      run: |
-        sudo apt-get install -y htop
-        sleep 3 | htop  > ./htop.out
-        head -c  ./htop.out  | tail -c +10
+        nproc
+        lsmem
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -28,25 +28,15 @@ permissions:
   contents: read
 
 jobs:
-  test-8cpu:
+  test-arm-2cpu:
     uses: ./.github/workflows/build-k3s.yaml
     with:
-      runner: ${{ github.repository == 'k3s-io/k3s' && 'equinix-8cpu-32gb' || 'ubuntu-latest' }}
-      upload-image: true
-  test-4cpu:
-    uses: ./.github/workflows/build-k3s.yaml
-    with:
-      runner: ${{ github.repository == 'k3s-io/k3s' && 'equinix-4cpu-16gb' || 'ubuntu-latest' }}
-      upload-image: true
-  test-gha:
-    uses: ./.github/workflows/build-k3s.yaml
-    with:
-      runner: ${{ github.repository == 'k3s-io/k3s' && 'ubuntu-latest' || 'ubuntu-latest' }}
+      runner: ${{ github.repository == 'k3s-io/k3s' && 'oracle-aarch64-2cpu-8gb' || 'ubuntu-latest' }}
       upload-image: true
-  test-keda:
+  test-arm-4cpu:
     uses: ./.github/workflows/build-k3s.yaml
     with:
-      runner: ${{ github.repository == 'k3s-io/k3s' && 'equinix-keda-runner' || 'ubuntu-latest' }}
+      runner: ${{ github.repository == 'k3s-io/k3s' && 'oracle-aarch64-4cpu-16gb' || 'ubuntu-latest' }}
       upload-image: true
   build:
     uses: ./.github/workflows/build-k3s.yaml