From 46539edf03cb217409a35b6ae538f0db744a67b8 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Tue, 27 May 2025 09:04:24 +0200 Subject: [PATCH] ci: Rename debian-testing to debian-x86_64 This matches the naming scheme used for debian-arm32 and debian-arm64. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 18 +++++++-------- .gitlab-ci/lava/lava-gitlab-ci.yml | 6 ++--- .gitlab-ci/test/gitlab-ci.yml | 22 +++++++++---------- src/gallium/drivers/i915/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 4 ++-- src/gallium/drivers/r300/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 2 +- .../frontends/lavapipe/ci/gitlab-ci.yml | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index b2a462c79e0..63017a1cb99 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -82,7 +82,7 @@ - *meson-build -debian-testing: +debian-x86_64: extends: - .meson-build-for-tests - .use-debian/x86_64_build @@ -108,14 +108,14 @@ debian-testing: -D tools=drm-shim -D valgrind=disabled S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE} - RUN_MESON_TESTS: "false" # debian-build-testing already runs these + RUN_MESON_TESTS: "false" # debian-build-x86_64 already runs these artifacts: reports: junit: artifacts/ci_scripts_report.xml -debian-testing-asan: +debian-x86_64-asan: extends: - - debian-testing + - debian-x86_64 - .meson-build-for-tests - .build-run-long variables: @@ -148,7 +148,7 @@ debian-testing-asan: -D video-codecs= -D vulkan-drivers= -debian-testing-msan: +debian-x86_64-msan: # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo # msan cannot fully work until it's used together with msan libc extends: @@ -206,9 +206,9 @@ debian-testing-msan: -D install-precomp-compiler=true -D tools=panfrost -debian-testing-ubsan: +debian-x86_64-ubsan: extends: - - debian-testing + - debian-x86_64 - .meson-build-for-tests - .build-run-long variables: @@ -240,7 +240,7 @@ debian-testing-ubsan: -D mesa-clc=enabled -D install-mesa-clc=true -debian-build-testing: +debian-build-x86_64: extends: - .meson-build-for-tests - .use-debian/x86_64_build @@ -269,7 +269,7 @@ debian-build-testing: -D spirv-to-dxil=true -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi -D perfetto=true - S3_ARTIFACT_NAME: debian-build-testing + S3_ARTIFACT_NAME: debian-build-x86_64 # Test a release build with -Werror so new warnings don't sneak in. debian-release: diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 7aa6ccc66ca..11019ecd654 100644 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -86,7 +86,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-gl artifacts: false - - job: debian-testing + - job: debian-x86_64 artifacts: false .lava-x86_64-test-video: @@ -97,7 +97,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-video artifacts: false - - job: debian-testing + - job: debian-x86_64 artifacts: false .lava-x86_64-test-vk: @@ -108,7 +108,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-vk artifacts: false - - job: debian-testing + - job: debian-x86_64 artifacts: false .lava-arm32-test: diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index dda8b1c06cd..84fad43e2f7 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -63,9 +63,9 @@ shader-db: - .gitlab-ci/build/gitlab-ci.yml - .gitlab-ci/run-shader-db.sh needs: - - debian-build-testing + - debian-build-x86_64 variables: - S3_ARTIFACT_NAME: debian-build-testing + S3_ARTIFACT_NAME: debian-build-x86_64 before_script: - !reference [.download_s3, before_script] script: | @@ -127,7 +127,7 @@ yaml-toml-shell-py-test: - .use-debian/x86_64_test-gl needs: - debian/x86_64_test-gl - - debian-testing + - debian-x86_64 - !reference [.required-for-hardware-jobs, needs] variables: DEBIAN_ARCH: amd64 @@ -138,7 +138,7 @@ yaml-toml-shell-py-test: - .test - .use-debian/x86_64_test-vk needs: - - debian-testing + - debian-x86_64 - debian/x86_64_test-vk - !reference [.required-for-hardware-jobs, needs] variables: @@ -169,7 +169,7 @@ yaml-toml-shell-py-test: # overwritten depending on the physical machine running the job. VK_DRIVER: "lvp" needs: - - job: debian-testing + - job: debian-x86_64 artifacts: true # On the host we want the Linux build - job: debian-android artifacts: false # The Android build will be downloaded later @@ -470,7 +470,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-vk artifacts: false - - job: debian-testing + - job: debian-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -479,11 +479,11 @@ yaml-toml-shell-py-test: - .use-debian/x86_64_test-vk - .ci-tron-x86_64-test variables: - S3_ARTIFACT_NAME: "debian-build-testing" + S3_ARTIFACT_NAME: "debian-build-x86_64" needs: - job: debian/x86_64_test-vk artifacts: false - - job: debian-build-testing + - job: debian-build-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -494,7 +494,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-gl artifacts: false - - job: debian-testing + - job: debian-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -503,11 +503,11 @@ yaml-toml-shell-py-test: - .use-debian/x86_64_test-gl - .ci-tron-x86_64-test variables: - S3_ARTIFACT_NAME: "debian-build-testing" + S3_ARTIFACT_NAME: "debian-build-x86_64" needs: - job: debian/x86_64_test-gl artifacts: false - - job: debian-build-testing + - job: debian-build-x86_64 artifacts: false - !reference [.ci-tron-test, needs] diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml index 1ffc2a9d9a2..b2ca3073fd7 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: - - .ci-tron-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing + - .ci-tron-x86_64-test-gl-manual # use debian-build-x86_64 rather than debian-x86_64 - .i915g-manual-rules variables: FDO_CI_CONCURRENT: 2 diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index ace1a5a98c0..21ea5b6a245 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -7,7 +7,7 @@ llvmpipe-piglit-rusticl: - .llvmpipe-rusticl-rules - .test-piglit needs: - - debian-testing + - debian-x86_64 - debian/x86_64_test-gl variables: DEQP_SUITE: llvmpipe-rusticl @@ -64,7 +64,7 @@ llvmpipe-deqp-asan: extends: .llvmpipe-deqp-test needs: - debian/x86_64_test-gl - - debian-testing-asan + - debian-x86_64-asan .android-llvmpipe: extends: diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml index 821093cacc9..0945403dace 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: - - .ci-tron-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing + - .ci-tron-x86_64-test-gl-manual # use debian-build-x86_64 rather than debian-x86_64 - .r300-manual-rules variables: FDO_CI_CONCURRENT: 2 diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index ea1558d008b..4e592b970aa 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -27,4 +27,4 @@ softpipe-asan-gles31: extends: .softpipe-deqp-test needs: - debian/x86_64_test-gl - - debian-testing-asan + - debian-x86_64-asan diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml index ffe7cfe6583..5596e10d243 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml @@ -31,7 +31,7 @@ lavapipe-vk-asan: S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized needs: - debian/x86_64_test-vk - - debian-testing-asan + - debian-x86_64-asan lavapipe-vkd3d: stage: software-renderer-nightly