Merge pull request #6192 from trws/matrix-timeouts

matrix/actions: add per-target timeout-minutes

Author: mergify[bot]

.github/workflows/main.yml

@@ -141,7 +141,6 @@ jobs:
       DOCKER_USERNAME: travisflux
       DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_TRAVISFLUX_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    timeout-minutes: 120
     strategy:
       matrix: ${{fromJson(needs.generate-matrix.outputs.matrix)}}
       fail-fast: false
@@ -199,6 +198,7 @@ jobs:
         docker run --rm --privileged aptman/qus -s -- -p --credential aarch64
 
     - name: docker-run-checks
+      timeout-minutes: ${{matrix.timeout_minutes}}
       env: ${{matrix.env}}
       run: ${{matrix.command}}
 
@@ -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 ; do
+        for d in el9 noble alpine fedora40 ; 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

@@ -3,6 +3,7 @@
 #  Generate a build matrix for use with github workflows
 #
 
+from copy import deepcopy
 import json
 import os
 import re
@@ -30,6 +31,7 @@ def on_master_or_tag(matrix):
         "when": on_master_or_tag,
         "suffix": " - arm64",
         "command_args": "--install-only ",
+        "timeout_minutes": 90,
     },
     "linux/amd64": {"when": lambda _: True},
 }
@@ -92,6 +94,7 @@ def add_build(
         recheck=True,
         platform=None,
         command_args="",
+        timeout_minutes=60,
     ):
         """Add a build to the matrix.include array"""
 
@@ -150,6 +153,7 @@ def add_build(
                 "docker_tag": docker_tag,
                 "needs_buildx": needs_buildx,
                 "create_release": create_release,
+                "timeout_minutes": timeout_minutes,
             }
         )
 
@@ -171,6 +175,7 @@ def add_multiarch_build(
                     docker_tag=docker_tag,
                     image=image if image is not None else name,
                     command_args=args.get("command_args", ""),
+                    timeout_minutes=args.get("timeout_minutes", 30),
                     **kwargs,
                 )
 
@@ -184,7 +189,7 @@ def __str__(self):
 matrix = BuildMatrix()
 
 # Multi-arch builds, arm only builds on
-bookworm_platforms = dict(DEFAULT_MULTIARCH_PLATFORMS)
+bookworm_platforms = deepcopy(DEFAULT_MULTIARCH_PLATFORMS)
 bookworm_platforms["linux/386"] = {"when": lambda _: True, "suffix": " - 32 bit"}
 common_args = (
     "--prefix=/usr"
@@ -203,46 +208,44 @@ def __str__(self):
         TEST_INSTALL="t",
     ),
 )
+fedora40_platforms = deepcopy(DEFAULT_MULTIARCH_PLATFORMS)
+fedora40_platforms["linux/arm64"]["timeout_minutes"] = 240
 matrix.add_multiarch_build(
-    name="noble",
+    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="el9",
+    name="noble",
     default_suffix=" - test-install",
     args=common_args,
     env=dict(
         TEST_INSTALL="t",
     ),
 )
 matrix.add_multiarch_build(
-    name="alpine",
+    name="el9",
     default_suffix=" - test-install",
-    args=(
-        "--prefix=/usr"
-        " --sysconfdir=/etc"
-        " --with-systemdsystemunitdir=/etc/systemd/system"
-        " --localstatedir=/var"
-        " --with-flux-security"
-    ),
+    args=common_args,
     env=dict(
         TEST_INSTALL="t",
     ),
 )
-
-# single arch builds that still produce a container
-matrix.add_build(
-    name="fedora40 - test-install",
+matrix.add_multiarch_build(
+    name="alpine",
+    default_suffix=" - test-install",
     args=common_args,
     env=dict(
         TEST_INSTALL="t",
     ),
-    docker_tag=True,
 )
+# single arch builds that still produce a container
 # Ubuntu: TEST_INSTALL
 matrix.add_build(
     name="jammy - test-install",