From f20bd9ff62860a85cfbecd109485a269388df467 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Mar 2025 14:57:41 +0000 Subject: [PATCH] CI: move CPU_REQUEST from .build to .setup We were only setting the k8s CPU request in .build jobs not .setup. This was intentional initially so that only the build jobs get more resources, but some of the non-.build jobs are resource-heavy. For example, the pending-updates job has to parse the entire metadata from scratch, and that sometimes takes longer than usual when we only have two cores to use. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baa541d7..698f49d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,8 @@ stages: .setup: tags: - $DEFAULT_TAG + variables: + KUBERNETES_CPU_REQUEST: $CPU_REQUEST stage: build interruptible: true variables: @@ -52,8 +54,6 @@ stages: # Generalised fragment to do a Kas build .build: extends: .setup - variables: - KUBERNETES_CPU_REQUEST: $CPU_REQUEST rules: # Don't run MR pipelines - if: $CI_PIPELINE_SOURCE == "merge_request_event"