From 187f21c26a270abf975faf094a272f00f0d90147 Mon Sep 17 00:00:00 2001 From: Ryan Krattiger Date: Fri, 23 Oct 2026 12:32:06 -0500 Subject: [PATCH] Include detailed resource requests after defaults Before this was applying the detailed requests, and then overriding those values with defaults. This also leads to duplicating tags which will implicitly disallow running on statically sized runners like UO. Signed-off-by: Ryan Krattiger --- .ci/gitlab/include.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/gitlab/include.yaml b/.ci/gitlab/include.yaml index bd0b6a8f4d4..3c1de4c93fc 100644 --- a/.ci/gitlab/include.yaml +++ b/.ci/gitlab/include.yaml @@ -36,12 +36,7 @@ include: - path: configs/cray-rhel/ when: '"rhel" in os and env.get("CRAYPE_VERSION")' - # === Linux/Cray === - # Configs basis for linux and cray - - path: configs/linux - when: platform == "linux" - - # === Per-package resource requests (Only used for Linux on Kubernetes) === + # === Per-package resource requests (Only used for Linux) === - when: 'platform == "linux" and env.get("SPACK_CI_GENERATE")' git: https://gitlab.spack.io/spack/resource-requests branch: main @@ -49,5 +44,10 @@ include: - ci.yaml optional: true + # === Linux/Cray === + # Configs basis for linux and cray + - path: configs/linux + when: platform == "linux" + # === Generic === - configs