From c78a7d464b1a2e0b87b9606752ca25ce59cc4af4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 5 May 2025 17:27:15 +0200 Subject: [PATCH] ci/ci-tron: deduplicate setting the runner tags for most jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit etnaviv is the important exception, as it needs to set two fields for the setup tags, which need to be handled individually as runner tags. The other exception is the nightly vangogh job that has a custom tag added, which I'll hopefully get rid of Soon™. One farm's jobs were also missing farm:$RUNNER_FARM_LOCATION; this change ensures that it's always set, avoiding the risk of accidentally picking an equivalent device in another farm. Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 3 +++ src/amd/ci/gitlab-ci-inc.yml | 30 ----------------------- src/freedreno/ci/gitlab-ci-inc.yml | 3 --- src/gallium/drivers/i915/ci/gitlab-ci.yml | 3 +-- src/gallium/drivers/r300/ci/gitlab-ci.yml | 7 +----- src/nouveau/ci/gitlab-ci-inc.yml | 2 -- 6 files changed, 5 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 95b15146aca..46fc19989a5 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -437,6 +437,9 @@ yaml-toml-shell-py-test: - job: python-artifacts artifacts: true - !reference [.required-for-hardware-jobs, needs] + tags: + - farm:$RUNNER_FARM_LOCATION + - $B2C_MARS_SETUP_TAGS before_script: # We don't want the tarball unpacking of .test, but will take the JWT bits. diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 3364cbc298b..e3408964988 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -315,9 +315,6 @@ RUNNER_FARM_LOCATION: mupuf B2C_MARS_SETUP_TAGS: amdgpu:codename:TAHITI B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .hawaii-test-valve: variables: @@ -325,18 +322,12 @@ RUNNER_FARM_LOCATION: mupuf B2C_MARS_SETUP_TAGS: amdgpu:codename:HAWAII B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .kabini-test-valve: variables: RUNNER_FARM_LOCATION: mupuf B2C_MARS_SETUP_TAGS: amdgpu:codename:KABINI B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .polaris10-test-valve: variables: @@ -346,9 +337,6 @@ # (2022-01) tsc=unstable was added in response to this message in kmsg, # TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'. B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g tsc=unstable' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .polaris10-test-valve-mupuf: extends: .polaris10-test-valve @@ -366,9 +354,6 @@ B2C_MARS_SETUP_TAGS: amdgpu:codename:VEGA10 FDO_CI_CONCURRENT: 16 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .renoir-test-valve: variables: @@ -378,9 +363,6 @@ B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' B2C_TIMEOUT_BOOT_MINUTES: 60 B2C_TIMEOUT_OVERALL_MINUTES: 120 - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .navi10-test-valve: variables: @@ -390,9 +372,6 @@ # MSI IRQs leading to GPU hangs on amdgpu. B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic' B2C_MARS_SETUP_TAGS: amdgpu:codename:NAVI10 - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .navi10-test-valve-mupuf: extends: @@ -414,9 +393,6 @@ B2C_MARS_SETUP_TAGS: amdgpu:codename:NAVI21 FDO_CI_CONCURRENT: 32 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .vangogh-test-valve: variables: @@ -437,9 +413,6 @@ B2C_MARS_SETUP_TAGS: amdgpu:codename:RAPHAEL FDO_CI_CONCURRENT: 32 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS .navi31-test-valve: variables: @@ -447,9 +420,6 @@ B2C_MARS_SETUP_TAGS: amdgpu:codename:NAVI31 FDO_CI_CONCURRENT: 32 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS ############### VKCTS tests ############### diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index d2ebdab7f7e..e3385ae9075 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -371,6 +371,3 @@ B2C_BOOT_WD_STOP_REGEX: 'CPU features: detected:' # A line repeated during Linux boot GPU_VERSION: freedreno-a750 VK_DRIVER: freedreno - tags: - - farm:$RUNNER_FARM_LOCATION - - $B2C_MARS_SETUP_TAGS diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml index 8d10cbf86d9..e4757508a15 100644 --- a/src/gallium/drivers/i915/ci/gitlab-ci.yml +++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml @@ -9,10 +9,9 @@ include: variables: FDO_CI_CONCURRENT: 2 GPU_VERSION: i915-g33 + RUNNER_FARM_LOCATION: ondracka B2C_KERNEL_URL: https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/v0.9.12.3/downloads/linux-x86_64 B2C_MARS_SETUP_TAGS: intelgpu:codename:G33 - tags: - - $B2C_MARS_SETUP_TAGS i915-g33: extends: diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml index 225a9da5444..d11aa0ecb45 100644 --- a/src/gallium/drivers/r300/ci/gitlab-ci.yml +++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml @@ -7,6 +7,7 @@ include: - .r300-manual-rules variables: FDO_CI_CONCURRENT: 2 + RUNNER_FARM_LOCATION: ondracka # 6.6.8 kernel with radeon driver. B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/ondracka/boot2container/-/wikis/uploads/1733cfc7cc114d08ec785044b24314f3/linux-x86_64' @@ -15,16 +16,12 @@ include: - .ondracka-generic variables: B2C_MARS_SETUP_TAGS: radeon:codename:RV530 - tags: - - $B2C_MARS_SETUP_TAGS .ondracka-rv380: extends: - .ondracka-generic variables: B2C_MARS_SETUP_TAGS: radeon:codename:RV380 - tags: - - $B2C_MARS_SETUP_TAGS r300-rv530-deqp-gles2: extends: @@ -64,8 +61,6 @@ r300-rv410-deqp-piglit: GPU_VERSION: r300-rv410 PIGLIT_PLATFORM: gbm B2C_MARS_SETUP_TAGS: radeon:codename:RV410 - tags: - - $B2C_MARS_SETUP_TAGS r300-rv530-piglit: extends: diff --git a/src/nouveau/ci/gitlab-ci-inc.yml b/src/nouveau/ci/gitlab-ci-inc.yml index 8bbb7843a29..b1a6fcf4312 100644 --- a/src/nouveau/ci/gitlab-ci-inc.yml +++ b/src/nouveau/ci/gitlab-ci-inc.yml @@ -62,5 +62,3 @@ B2C_KERNEL_URL: 'https://static.engestrom.ch/linux-6.8-nvk-ga106' # GSP is not loaded by default B2C_KERNEL_CMDLINE_EXTRAS: 'nouveau.config=NvGspRm=1' - tags: - - $B2C_MARS_SETUP_TAGS