Run arm jobs under arm worker

Signed-off-by: Itxaka <[email protected]>
kairos-io · Jul 24, 2024 · 1dab50d · 1dab50d
1 parent 85c5c7e
commit 1dab50d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/.github/flavors.json b/.github/flavors.json
@@ -27,7 +27,7 @@
         "model": "rpi4",
         "baseImage": "opensuse/leap:15.6",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -37,7 +37,7 @@
         "model": "rpi3",
         "baseImage": "opensuse/leap:15.6",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -47,7 +47,7 @@
         "model": "rpi4",
         "baseImage": "opensuse/leap:15.6",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -57,7 +57,7 @@
         "model": "rpi3",
         "baseImage": "opensuse/leap:15.6",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -67,7 +67,7 @@
         "model": "generic",
         "baseImage": "opensuse/leap:15.6",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -97,7 +97,7 @@
         "model": "rpi4",
         "baseImage": "opensuse/tumbleweed",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -107,7 +107,7 @@
         "model": "rpi3",
         "baseImage": "opensuse/tumbleweed",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -117,7 +117,7 @@
         "model": "rpi4",
         "baseImage": "opensuse/tumbleweed",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "opensuse",
@@ -127,7 +127,7 @@
         "model": "rpi3",
         "baseImage": "opensuse/tumbleweed",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -157,7 +157,7 @@
         "model": "rpi4",
         "baseImage": "ubuntu:20.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -167,7 +167,7 @@
         "model": "rpi4",
         "baseImage": "ubuntu:20.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -197,7 +197,7 @@
         "model": "rpi4",
         "baseImage": "ubuntu:22.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -207,7 +207,7 @@
         "model": "rpi4",
         "baseImage": "ubuntu:22.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -217,7 +217,7 @@
         "model": "generic",
         "baseImage": "ubuntu:24.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "ubuntu",
@@ -247,7 +247,7 @@
         "model": "generic",
         "baseImage": "ubuntu:24.04",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "alpine",
@@ -277,7 +277,7 @@
         "model": "rpi4",
         "baseImage": "alpine:3.19",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "alpine",
@@ -287,7 +287,7 @@
         "model": "rpi3",
         "baseImage": "alpine:3.19",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "alpine",
@@ -297,7 +297,7 @@
         "model": "rpi4",
         "baseImage": "alpine:3.19",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "alpine",
@@ -307,7 +307,7 @@
         "model": "rpi3",
         "baseImage": "alpine:3.19",
         "arch": "arm64",
-        "worker": "ubuntu-latest"
+        "worker": "ARM64"
     },
     {
         "family": "rhel",

diff --git a/.github/workflows/image-arm-pr.yaml b/.github/workflows/image-arm-pr.yaml
@@ -36,7 +36,7 @@ jobs:
       family: opensuse
       base_image: opensuse/leap:15.6
       model: rpi4
-      worker: fast
+      worker: ARM64
   alpine:
     uses: ./.github/workflows/reusable-docker-arm-build.yaml
     permissions:
@@ -60,4 +60,4 @@ jobs:
       family: alpine
       base_image: alpine:3.19
       model: rpi4
-      worker: fast
+      worker: ARM64
diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
@@ -75,7 +75,7 @@ jobs:
           echo "::set-output name=matrix::{\"include\": $content }"
 
   build-nvidia-base:
-    runs-on: fast
+    runs-on: ARM64
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
@@ -165,7 +165,7 @@ jobs:
       family: ubuntu
       base_image: quay.io/kairos/cache:nvidia-base
       model: nvidia-jetson-agx-orin
-      worker: fast
+      worker: ARM64
 
   build-arm-core:
     runs-on: ${{ matrix.worker }}
@@ -304,7 +304,7 @@ jobs:
           category: ${{ matrix.flavor }}
 
   build-arm-standard:
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ARM64
     needs:
       - get-standard-matrix
     permissions:
@@ -413,7 +413,7 @@ jobs:
           docker images --format "{{.Size}} - {{.Repository}}:{{.Tag}}"
 
   build-arm-generic:
-    runs-on: ubuntu-latest
+    runs-on: ARM64
     strategy:
       fail-fast: false
       matrix: