From 26e35d538ad4ce2ef07e9c6896f4a64ff0a9c821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Mon, 17 Mar 2025 07:05:01 +0200 Subject: [PATCH] ci: rename all the .b2c- jobs into .ci-tron- We named these jobs like this despite b2c being an implementation detail because we did not have a name for this bare-metal infra. Now that we do (CI-Tron), let's rename the jobs to remove the confusion. Co-authored-by: Eric Engestrom Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 68 +++++++++---------- src/amd/ci/gitlab-ci-inc.yml | 6 +- src/amd/ci/gitlab-ci.yml | 46 ++++++------- src/etnaviv/ci/gitlab-ci.yml | 8 +-- src/freedreno/ci/gitlab-ci.yml | 10 +-- src/gallium/drivers/i915/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/r300/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 6 +- src/nouveau/ci/gitlab-ci.yml | 4 +- 9 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index a4b49ccff87..0c59759a8a1 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -380,7 +380,7 @@ yaml-toml-shell-py-test: FDO_CI_CONCURRENT: 0 # Default to number of CPUs # For CI-tron based testing farm jobs. -.b2c-test: +.ci-tron-test: extends: - .ci-tron-b2c-job-v1 timeout: 1h 40m @@ -452,9 +452,9 @@ yaml-toml-shell-py-test: reports: junit: results/**/junit.xml -.b2c-x86_64-test: +.ci-tron-x86_64-test: extends: - - .b2c-test + - .ci-tron-test variables: CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_amd64.cpio.xz' CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download' # Linux 6.1 @@ -466,21 +466,21 @@ yaml-toml-shell-py-test: S3_ARTIFACT_NAME: "mesa-x86_64-default-debugoptimized" -.b2c-x86_64-test-vk: +.ci-tron-x86_64-test-vk: extends: - .use-debian/x86_64_test-vk - - .b2c-x86_64-test + - .ci-tron-x86_64-test needs: - job: debian/x86_64_test-vk artifacts: false - job: debian-testing artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-x86_64-test-vk-manual: +.ci-tron-x86_64-test-vk-manual: extends: - .use-debian/x86_64_test-vk - - .b2c-x86_64-test + - .ci-tron-x86_64-test variables: S3_ARTIFACT_NAME: "debian-build-testing" needs: @@ -488,23 +488,23 @@ yaml-toml-shell-py-test: artifacts: false - job: debian-build-testing artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-x86_64-test-gl: +.ci-tron-x86_64-test-gl: extends: - .use-debian/x86_64_test-gl - - .b2c-x86_64-test + - .ci-tron-x86_64-test needs: - job: debian/x86_64_test-gl artifacts: false - job: debian-testing artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-x86_64-test-gl-manual: +.ci-tron-x86_64-test-gl-manual: extends: - .use-debian/x86_64_test-gl - - .b2c-x86_64-test + - .ci-tron-x86_64-test variables: S3_ARTIFACT_NAME: "debian-build-testing" needs: @@ -512,72 +512,72 @@ yaml-toml-shell-py-test: artifacts: false - job: debian-build-testing artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-arm64-test: +.ci-tron-arm64-test: extends: - - .b2c-test + - .ci-tron-test variables: CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_arm64.cpio.xz' CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-arm64' S3_ARTIFACT_NAME: "mesa-arm64-default-debugoptimized" -.b2c-arm64-test-vk: +.ci-tron-arm64-test-vk: extends: - .use-debian/arm64_test-vk - - .b2c-arm64-test + - .ci-tron-arm64-test needs: - job: debian/arm64_test-vk artifacts: false - job: debian-arm64 artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-arm64-test-gl: +.ci-tron-arm64-test-gl: extends: - .use-debian/arm64_test-gl - - .b2c-arm64-test + - .ci-tron-arm64-test needs: - job: debian/arm64_test-gl artifacts: false - job: debian-arm64 artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-arm32-test: +.ci-tron-arm32-test: extends: - - .b2c-test + - .ci-tron-test variables: CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_arm.cpio.xz' CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-arm' S3_ARTIFACT_NAME: "mesa-arm32-default-debugoptimized" -.b2c-arm32-test-vk: +.ci-tron-arm32-test-vk: extends: - .use-debian/arm32_test-vk - - .b2c-arm32-test + - .ci-tron-arm32-test needs: - job: debian/arm32_test-vk artifacts: false - job: debian-arm32 artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-arm32-test-gl: +.ci-tron-arm32-test-gl: extends: - .use-debian/arm32_test-gl - - .b2c-arm32-test + - .ci-tron-arm32-test needs: - job: debian/arm32_test-gl artifacts: false - job: debian-arm32 artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] -.b2c-arm32-test-asan-gl: +.ci-tron-arm32-test-asan-gl: extends: - .use-debian/arm32_test-gl - - .b2c-arm32-test + - .ci-tron-arm32-test variables: S3_ARTIFACT_NAME: "mesa-arm32-asan-debugoptimized" DEQP_FORCE_ASAN: 1 @@ -586,4 +586,4 @@ yaml-toml-shell-py-test: artifacts: false - job: debian-arm32-asan artifacts: false - - !reference [.b2c-test, needs] + - !reference [.ci-tron-test, needs] diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 112f3bbe745..981e2ebdc3f 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -285,7 +285,7 @@ GPU_VERSION: amd-raven VK_DRIVER: radeon -############### Valve Infra +############### CI-tron .test-radv: variables: VK_DRIVER: radeon @@ -302,9 +302,9 @@ CI_TRON_PATTERN__JOB_WARN__REGEX: '\*ERROR\* ring .* timeout' CI_TRON__B2C_SWAP_SIZE: '16g' -.b2c-test-radv-vk: +.ci-tron-test-radv-vk: extends: - - .b2c-x86_64-test-vk + - .ci-tron-x86_64-test-vk - .radv-valve-rules - .test-radv variables: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 2a392057c7e..c207a0d2058 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -161,7 +161,7 @@ radeonsi-raven-vaapi-fluster: # Hence, disable it for now. .radv-kabini-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .kabini-test-valve - .radv-valve-manual-rules # Make sure this job is *always* run manually timeout: 12h @@ -173,7 +173,7 @@ radeonsi-raven-vaapi-fluster: radv-tahiti-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .tahiti-test-valve - .radv-valve-manual-rules # Make sure this job is *always* run manually timeout: 1h @@ -186,7 +186,7 @@ radv-tahiti-vkcts: radv-hawaii-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .hawaii-test-valve - .radv-valve-manual-rules timeout: 1h @@ -199,7 +199,7 @@ radv-hawaii-vkcts: radv-polaris10-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .polaris10-test-valve-kws - .radv-valve-manual-rules timeout: 1h 15m @@ -213,7 +213,7 @@ radv-polaris10-vkcts: radv-vega10-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .vega10-test-valve - .radv-valve-manual-rules timeout: 1h 15m @@ -226,7 +226,7 @@ radv-vega10-vkcts: radv-renoir-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .renoir-test-valve - .radv-valve-manual-rules timeout: 2h 15m @@ -241,7 +241,7 @@ radv-renoir-vkcts: radv-navi10-vkcts: parallel: 2 extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .navi10-test-valve-kws - .radv-valve-manual-rules variables: @@ -253,7 +253,7 @@ radv-navi21-vkcts: timeout: 35m parallel: 3 extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .navi21-test-valve - .radv-valve-rules variables: @@ -266,7 +266,7 @@ radv-navi21-vkcts: radv-vangogh-vkcts: parallel: 2 extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .vangogh-test-valve - .radv-valve-manual-rules timeout: 90m @@ -279,7 +279,7 @@ radv-vangogh-vkcts: radeonsi-vangogh-glcts-full: extends: - - .b2c-x86_64-test-gl + - .ci-tron-x86_64-test-gl - .test-piglit - .vangogh-test-valve - .radeonsi-valve-manual-rules @@ -302,7 +302,7 @@ radeonsi-vangogh-glcts: radv-raphael-vkcts: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .raphael-test-valve - .radv-valve-manual-rules timeout: 45m @@ -317,7 +317,7 @@ radv-navi31-vkcts: timeout: 25m parallel: 2 extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .navi31-test-valve - .radv-valve-rules variables: @@ -368,7 +368,7 @@ radv-fossils: radv-tahiti-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .tahiti-test-valve - .radv-valve-manual-rules @@ -379,7 +379,7 @@ radv-tahiti-vkd3d: radv-hawaii-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .hawaii-test-valve - .radv-valve-manual-rules @@ -390,7 +390,7 @@ radv-hawaii-vkd3d: radv-polaris10-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .polaris10-test-valve-kws - .radv-valve-manual-rules @@ -401,7 +401,7 @@ radv-polaris10-vkd3d: radv-vega10-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .vega10-test-valve - .radv-valve-manual-rules @@ -412,7 +412,7 @@ radv-vega10-vkd3d: radv-renoir-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .renoir-test-valve - .radv-valve-manual-rules @@ -423,7 +423,7 @@ radv-renoir-vkd3d: radv-navi10-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .navi10-test-valve-mupuf - .radv-valve-manual-rules @@ -434,7 +434,7 @@ radv-navi10-vkd3d: radv-navi21-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .navi21-test-valve - .radv-valve-manual-rules @@ -445,7 +445,7 @@ radv-navi21-vkd3d: radv-vangogh-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .vangogh-test-valve - .radv-valve-manual-rules @@ -456,7 +456,7 @@ radv-vangogh-vkd3d: radv-raphael-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .raphael-test-valve - .radv-valve-manual-rules @@ -467,7 +467,7 @@ radv-raphael-vkd3d: radv-navi31-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .navi31-test-valve - .radv-valve-manual-rules @@ -478,7 +478,7 @@ radv-navi31-vkd3d: .radv-kabini-vkd3d: extends: - - .b2c-test-radv-vk + - .ci-tron-test-radv-vk - .test-vkd3d-proton - .kabini-test-valve - .radv-valve-manual-rules diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml index 189ac4c2ace..48afd927b9e 100644 --- a/src/etnaviv/ci/gitlab-ci.yml +++ b/src/etnaviv/ci/gitlab-ci.yml @@ -117,7 +117,7 @@ gc2000-gles2: extends: - - .b2c-arm32-test-gl + - .ci-tron-arm32-test-gl - .austriancoder-imx6q-cubox-i-4cores:arm32 - .etnaviv-manual-rules variables: @@ -131,7 +131,7 @@ gc2000-gles2: # Disabled until the 168 fails get addressed .gc2000-gles2-asan: extends: - - .b2c-arm32-test-asan-gl + - .ci-tron-arm32-test-asan-gl - .austriancoder-imx6q-cubox-i-2cores:arm32 - .etnaviv-manual-rules variables: @@ -155,7 +155,7 @@ gc2000-piglit: gc3000-gles2: extends: - - .b2c-arm32-test-gl + - .ci-tron-arm32-test-gl - .austriancoder-imx6qp-nitrogen6_max:arm32 - .etnaviv-manual-rules variables: @@ -167,7 +167,7 @@ gc3000-gles2: gc7000-imx8mq-gles2: extends: - - .b2c-arm64-test-gl + - .ci-tron-arm64-test-gl - .austriancoder-imx8mq-nitrogen:arm64 - .etnaviv-manual-rules variables: diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 920e74bf9fd..f492794bc71 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -442,7 +442,7 @@ a630-traces-performance: a750-angle: extends: - - .b2c-arm64-test-gl + - .ci-tron-arm64-test-gl - .a750-mupuf - .valve-turnip-manual-rules - .test-angle @@ -455,7 +455,7 @@ a750-angle: a750-gl: extends: - - .b2c-arm64-test-gl + - .ci-tron-arm64-test-gl - .a750-mupuf - .valve-freedreno-manual-rules timeout: 30m # base runtime 11min total, 8min of testing @@ -467,7 +467,7 @@ a750-gl: a750-piglit-cl: extends: - - .b2c-arm64-test-gl + - .ci-tron-arm64-test-gl - .test-piglit - .a750-mupuf - .valve-freedreno-manual-rules @@ -482,7 +482,7 @@ a750-piglit-cl: a750-vk: extends: - - .b2c-arm64-test-vk + - .ci-tron-arm64-test-vk - .a750-mupuf - .valve-turnip-manual-rules timeout: 75m # base runtime 54min total, 51min of testing @@ -494,7 +494,7 @@ a750-vk: a750-vkd3d: extends: - - .b2c-arm64-test-vk + - .ci-tron-arm64-test-vk - .a750-mupuf - .valve-turnip-manual-rules timeout: 15m # base runtime 3min diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml index 242a8c115f2..1ffc2a9d9a2 100644 --- a/src/gallium/drivers/i915/ci/gitlab-ci.yml +++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml @@ -4,7 +4,7 @@ include: # Manual test rules for using g33 in ondracka r300 farm. .ondracka-g33-test: extends: - - .b2c-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing + - .ci-tron-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing - .i915g-manual-rules variables: FDO_CI_CONCURRENT: 2 diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml index 2bb6f5ec1d4..60102ee3e8b 100644 --- a/src/gallium/drivers/r300/ci/gitlab-ci.yml +++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml @@ -3,7 +3,7 @@ include: .ondracka-generic: extends: - - .b2c-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing + - .ci-tron-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing - .r300-manual-rules variables: FDO_CI_CONCURRENT: 2 diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 4c1d93f6a4f..cf943517095 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -228,7 +228,7 @@ .zink-nvk-test-valve: extends: - - .b2c-x86_64-test-gl-manual + - .ci-tron-x86_64-test-gl-manual - .nvk-vkcts - .test-piglit - .zink-test @@ -239,7 +239,7 @@ .tu-zink-test-valve: extends: - - .b2c-arm64-test-gl + - .ci-tron-arm64-test-gl - .zink-test variables: VK_DRIVER: freedreno @@ -250,7 +250,7 @@ .radv-zink-test-valve: timeout: 30m extends: - - .b2c-x86_64-test-gl + - .ci-tron-x86_64-test-gl - .zink-test - .test-piglit - .test-radv diff --git a/src/nouveau/ci/gitlab-ci.yml b/src/nouveau/ci/gitlab-ci.yml index afd8ce8b7bc..5fa7b62522e 100644 --- a/src/nouveau/ci/gitlab-ci.yml +++ b/src/nouveau/ci/gitlab-ci.yml @@ -3,7 +3,7 @@ include: nvk-ga106-vkcts-valve: extends: - - .b2c-x86_64-test-vk-manual + - .ci-tron-x86_64-test-vk-manual - .nvk-vkcts - .nvk-ga106-valve - .nvk-valve-manual-rules @@ -14,7 +14,7 @@ nvk-ga106-vkcts-valve: nvk-ga106-vkd3d-valve: extends: - - .b2c-x86_64-test-vk-manual + - .ci-tron-x86_64-test-vk-manual - .nvk-vkcts - .nvk-ga106-valve - .nvk-valve-manual-rules