From 0c14b0c95335ad303edea47f081cc842ff8af09b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 6 Sep 2023 09:37:19 +1200 Subject: [PATCH] .gitlab-ci: Allow ext4 jobs to run on shared runners At the time of this commit, GitLab shared runners tagged "gce" were 2x AMD EPYC 7B12 with 8GB ram. Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Andrew Bartlett Signed-off-by: Stefan Metzmacher (cherry picked from commit 19fb9a97dff2c0222d89a19bc9b0cd27f0306408) --- .gitlab-ci-main.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 41c75bc490b..525a29a368b 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -416,8 +416,21 @@ samba-shellcheck: - if: $SUPPORT_PRIVATE_TEST == "yes" .needs_ext4_support: - # Our private runners provide an ext4 filesystem - extends: .private_test_only + # All runners provide an ext4 filesystem + # + # Note: we don't use + # extends: .shared_template_test_only + # as that somehow resets the needs section + # and generates problems for something + # like this (which is used below) + # + # .needs_samba-SOME-build-ext4: + # extends: + # - .needs_samba-SOME-build + # - .needs_ext4_support + # + # So we only set stage again instead... + stage: test_only .needs_5_15_kernel: # Our private runners are based on -- 2.47.2