ci: Separate build and test container tags

Rebuilding all the test containers for a change that only affects the build containers is costly and unnecessary. Split the `DEBIAN_BASE_TAG` into `DEBIAN_BUILD_BASE_TAG` and `DEBIAN_TEST_BASE_TAG` to make it possible to rebuild only the relevant half of the containers. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36736>
2025-12-20 03:00:11 +01:00 · 2025-08-12 08:40:11 +02:00 · 2025-08-12 08:40:11 +02:00 · 7a71e2e41b
commit 7a71e2e41b
parent 796e11008d
16 changed files with 29 additions and 30 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -398,8 +398,9 @@ sanity:
        ALPINE_X86_64_BUILD_TAG
        ALPINE_X86_64_LAVA_SSH_TAG
        ALPINE_X86_64_LAVA_TRIGGER_TAG
-        DEBIAN_BASE_TAG
+        DEBIAN_BUILD_BASE_TAG
        DEBIAN_BUILD_TAG
+        DEBIAN_TEST_BASE_TAG
        DEBIAN_TEST_ANDROID_TAG
        DEBIAN_TEST_GL_TAG
        DEBIAN_TEST_VK_TAG
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@ -1,7 +1,7 @@
 variables:
  CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7
  CONDITIONAL_BUILD_ANGLE_TAG: 9aaedd74072834a3c553656b6ddc17a7
-  CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377
+  CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
  CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9
  CONDITIONAL_BUILD_PIGLIT_TAG: 3dec1e03175e4cca1f644435e4e479d5
  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: af0d99317a3483526f9b59eac3d88451
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@ -3,7 +3,7 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 set -uex

--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@ -3,7 +3,7 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 # Do a very early check to make sure the tag is correct without the need of
 # setting up the environment variables locally
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@ -4,7 +4,7 @@
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 set -uex

--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@ -5,8 +5,8 @@ set -ex
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
 # DEBIAN_BUILD_TAG
+# DEBIAN_TEST_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG

 uncollapsed_section_start mold "Building mold"
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@ -9,7 +9,8 @@ section_start rust "Building Rust toolchain"

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_BUILD_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 # Pick a specific patch version from rustup so the compiler doesn't drift on us.
 RUST_VERSION=1.82.0
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@ -8,11 +8,8 @@ uncollapsed_section_start wayland "Building Wayland"
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
 # DEBIAN_BUILD_TAG
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_TEST_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG

 export LIBWAYLAND_VERSION="1.24.0"
--- a/.gitlab-ci/container/build-weston.sh
+++ b/.gitlab-ci/container/build-weston.sh
@ -7,7 +7,7 @@ section_start weston "Building Weston"

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 export WESTON_VERSION="14.0.1"

--- a/.gitlab-ci/container/build-xwayland.sh
+++ b/.gitlab-ci/container/build-xwayland.sh
@ -7,7 +7,7 @@ uncollapsed_section_start xwayland "Building XWayland"

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 #
 export XORGPROTO_VERSION="xorgproto-2024.1"
 export XWAYLAND_VERSION="xwayland-24.1.8"
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh
@ -2,7 +2,7 @@
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 set -e

--- a/.gitlab-ci/container/debian/gitlab-ci.yml
+++ b/.gitlab-ci/container/debian/gitlab-ci.yml
@ -30,7 +30,7 @@ debian/x86_64_build-base:
  extends:
    - .debian-container
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
    LLVM_VERSION: &debian-x86_64-llvm 19

 .use-debian/x86_64_build-base:
@ -196,7 +196,7 @@ debian/arm64_build:
  tags:
    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
  variables:
-    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
    LLVM_VERSION: &debian-arm64-llvm 19

 .use-debian/arm64_build:
@ -222,7 +222,7 @@ debian/x86_64_test-base:
    - .debian-container
    - .container-builds-base
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
    LLVM_VERSION: *debian-x86_64-llvm

 .use-debian/x86_64_test-base:
@ -250,7 +250,7 @@ debian/arm32_test-base:
    - .debian-container
    - .container-builds-base
  variables:
-    MESA_IMAGE_TAG: &debian-arm32_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm32_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
    LLVM_VERSION: *debian-arm64-llvm
    FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7"

@ -280,7 +280,7 @@ debian/arm64_test-base:
    - .debian-container
    - .container-builds-base
  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
    LLVM_VERSION: *debian-arm64-llvm

 .use-debian/arm64_test-base:
@ -520,8 +520,8 @@ debian/baremetal_arm32_test-gl:
    - job: debian/arm32_test-gl
      optional: true
  variables:
-    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"

 debian/baremetal_arm64_test-gl:
  extends:
@ -530,8 +530,8 @@ debian/baremetal_arm64_test-gl:
    - job: debian/arm64_test-gl
      optional: true
  variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"

 debian/baremetal_arm64_test-vk:
  extends:
@ -540,8 +540,8 @@ debian/baremetal_arm64_test-vk:
    - job: debian/arm64_test-vk
      optional: true
  variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"

 .use-debian/baremetal_arm32_test-gl:
  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@ -3,7 +3,7 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG

 set -e

--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@ -3,7 +3,7 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
+# DEBIAN_BUILD_BASE_TAG

 set -e

--- a/.gitlab-ci/container/install-meson.sh
+++ b/.gitlab-ci/container/install-meson.sh
@ -3,7 +3,7 @@
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BUILD_TAG
+# DEBIAN_BUILD_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG

 rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@ -19,10 +19,10 @@ include:
  - .gitlab-ci/conditional-build-image-tags.yml

 variables:
-  DEBIAN_BASE_TAG: "20250803-noxvfb"
-
+  DEBIAN_BUILD_BASE_TAG: "20250803-noxvfb"
  DEBIAN_BUILD_TAG: "20250722-libwayland"

+  DEBIAN_TEST_BASE_TAG: "20250812-crosvm"
  DEBIAN_TEST_ANDROID_TAG: "20250805-vkcts"
  DEBIAN_TEST_GL_TAG: "20250805-vkcts"
  DEBIAN_TEST_VIDEO_TAG: "20250609-helper"