Module: Mesa Branch: main Commit: fdbb5d5898367e6c11fc1f3c3000abecaca77ebd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fdbb5d5898367e6c11fc1f3c3000abecaca77ebd
Author: Eric Engestrom <[email protected]> Date: Thu Oct 19 20:07:55 2023 +0200 ci/valve-infra: ensure the correct farm picks up the job Until now, any farm that has a DUT that matches could have picked up the job. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25821> --- src/amd/ci/gitlab-ci-inc.yml | 8 ++++++++ src/amd/ci/gitlab-ci.yml | 1 + src/gallium/drivers/zink/ci/gitlab-ci.yml | 1 + 3 files changed, 10 insertions(+) diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 954ee8b983e..ed4127b2dd2 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -211,6 +211,7 @@ RUNNER_FARM_LOCATION: mupuf B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g' tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:KABINI .polaris10-test-valve: @@ -221,6 +222,7 @@ # 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 - amdgpu:codename:POLARIS10 .polaris10-test-valve-mupuf: @@ -239,6 +241,7 @@ FDO_CI_CONCURRENT: 16 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:VEGA10 .renoir-test-valve: @@ -249,6 +252,7 @@ B2C_TIMEOUT_BOOT_MINUTES: 60 B2C_TIMEOUT_OVERALL_MINUTES: 120 tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:RENOIR .navi10-test-valve: @@ -259,6 +263,7 @@ # MSI IRQs leading to GPU hangs on amdgpu. B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic' tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:NAVI10 .navi10-test-valve-mupuf: @@ -281,6 +286,7 @@ FDO_CI_CONCURRENT: 32 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:NAVI21 .vangogh-test-valve: @@ -291,6 +297,7 @@ B2C_TIMEOUT_OVERALL_MINUTES: 120 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:VANGOGH - $VALVE_INFRA_VANGOGH_JOB_PRIORITY @@ -301,6 +308,7 @@ B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/linux-x86_64' # Linux 6.3 tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:NAVI31 ############### VKCTS tests ############### diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index bb3ef666cc8..d0395cd8709 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -155,6 +155,7 @@ radeonsi-raven-va-full:x86_64: B2C_TIMEOUT_OVERALL_MINUTES: 240 B2C_TIMEOUT_BOOT_RETRIES: 0 tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:STONEY vkcts-polaris10-valve: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index e2b82c035e2..f34a7d65a49 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -140,4 +140,5 @@ zink-radv-vangogh-valve: FDO_CI_CONCURRENT: 6 # Override the list of tags to drop `priority:low` tags: + - farm:$RUNNER_FARM_LOCATION - amdgpu:codename:VANGOGH
