Merge pull request #6200 from trws/matrix-timeouts

matrix: remove fedora40 arm again

Author: mergify[bot]

.github/workflows/main.yml

@@ -254,7 +254,7 @@ jobs:
         echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         docker manifest create fluxrm/flux-core:bookworm fluxrm/flux-core:bookworm-amd64 fluxrm/flux-core:bookworm-386 fluxrm/flux-core:bookworm-arm64
         docker manifest push fluxrm/flux-core:bookworm
-        for d in el9 noble alpine fedora40 ; do
+        for d in el9 noble alpine ; do
           docker manifest create fluxrm/flux-core:$d fluxrm/flux-core:$d-amd64 fluxrm/flux-core:$d-arm64
           docker manifest push fluxrm/flux-core:$d
         done

src/test/generate-matrix.py

@@ -83,7 +83,7 @@ def env_add_s3(self, args, env):
     def add_build(
         self,
         name=None,
-        image="fedora40",
+        image=None,
         args=default_args,
         jobs=6,
         env=None,
@@ -208,18 +208,6 @@ def __str__(self):
         TEST_INSTALL="t",
     ),
 )
-fedora40_platforms = deepcopy(DEFAULT_MULTIARCH_PLATFORMS)
-fedora40_platforms["linux/arm64"]["timeout_minutes"] = 240
-matrix.add_multiarch_build(
-    name="fedora40",
-    default_suffix=" - test-install",
-    args=common_args,
-    platforms=fedora40_platforms,
-    env=dict(
-        TEST_INSTALL="t",
-    ),
-    docker_tag=True,
-)
 
 matrix.add_multiarch_build(
     name="noble",
@@ -246,6 +234,16 @@ def __str__(self):
     ),
 )
 # single arch builds that still produce a container
+matrix.add_build(
+    name="fedora40 - test-install",
+    image="fedora40",
+    args=common_args,
+    env=dict(
+        TEST_INSTALL="t",
+    ),
+    docker_tag=True,
+)
+
 # Ubuntu: TEST_INSTALL
 matrix.add_build(
     name="jammy - test-install",
@@ -282,6 +280,7 @@ def __str__(self):
 # fedora40: clang-18
 matrix.add_build(
     name="fedora40 - clang-18",
+    image="fedora40",
     env=dict(
         CC="clang-18",
         CXX="clang++-18",
@@ -322,6 +321,7 @@ def __str__(self):
 # inception
 matrix.add_build(
     name="inception",
+    image="fedora40",
     command_args="--inception",
 )