Merge pull request #1328 from trws/arm-runners

add Arm runners and bring back alpine
flux-framework · Jan 24, 2025 · 471da50 · 471da50
2 parents 22c24d5 + f63537a
commit 471da50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,7 +59,7 @@ jobs:
 
   ci-checks:
     needs: [ generate-matrix ]
-    runs-on: ubuntu-latest
+    runs-on: ${{matrix.runner}}
     env:
       TAP_DRIVER_QUIET: 1
       FLUX_TEST_TIMEOUT: 300
@@ -106,10 +106,6 @@ jobs:
       uses: docker/setup-buildx-action@v3
       if: matrix.needs_buildx
 
-    - name: setup qemu-user-static
-      run: |
-        docker run --rm --privileged aptman/qus -s -- -p --credential aarch64
-
     - name: docker-run-checks
       timeout-minutes: ${{matrix.timeout_minutes}}
       env: ${{matrix.env}}

diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py
@@ -20,12 +20,13 @@ def on_master_or_tag(matrix):
 
 DEFAULT_MULTIARCH_PLATFORMS = {
     "linux/arm64": {
-        "when": on_master_or_tag,
+        # "when": on_master_or_tag, # use this to only run on merge
+        "when": lambda _: True,
         "suffix": " - arm64",
-        "command_args": "--install-only ",
         "timeout_minutes": 90,
+        "runner": "ubuntu-24.04-arm",
     },
-    "linux/amd64": {"when": lambda _: True},
+    "linux/amd64": {"when": lambda _: True, "runner": "ubuntu-latest"},
 }
 
 
@@ -73,6 +74,7 @@ def add_build(
         platform=None,
         command_args="",
         timeout_minutes=60,
+        runner="ubuntu-latest",
     ):
         """Add a build to the matrix.include array"""
 
@@ -123,6 +125,7 @@ def add_build(
                 "env": env,
                 "command": command,
                 "image": image,
+                "runner": runner,
                 "tag": self.tag,
                 "branch": self.branch,
                 "coverage": coverage,
@@ -153,6 +156,7 @@ def add_multiarch_build(
                     image=image if image is not None else name,
                     command_args=args.get("command_args", ""),
                     timeout_minutes=args.get("timeout_minutes", 30),
+                    runner=args["runner"],
                     **kwargs,
                 )
 
@@ -198,16 +202,14 @@ def __str__(self):
         CHECK_RUN_SOURCE_ENV="/opt/rh/gcc-toolset-13/enable",
     ),
 )
-# Disabled because the arm64 build is failing and preventing the
-# generate-manifest step from running
-# matrix.add_multiarch_build(
-#     name="alpine",
-#     default_suffix=" - test-install",
-#     args=common_args,
-#     env=dict(
-#         TEST_INSTALL="t",
-#     ),
-# )
+matrix.add_multiarch_build(
+    name="alpine",
+    default_suffix=" - test-install",
+    args=common_args,
+    env=dict(
+        TEST_INSTALL="t",
+    ),
+)
 # single arch builds that still produce a container
 matrix.add_build(
     name="fedora40 - test-install",