ci: Move common variables out into a separate file

Moving common variables out allows for other projects like virglrenderer
to be able to reuse Mesa CI's containers

Signed-off-by: Rohan Garg <rohan.garg@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
[cristian: fixed conflicts while rebasing on latest main; updated tags]

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14413>

1 files changed, 20 insertions, 19 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb9e9ade757..980e4514616 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,7 @@ include:
     file:
       - '/templates/debian.yml'
       - '/templates/fedora.yml'
+  - local: '.gitlab-ci/image-tags.yml'
   - local: '.gitlab-ci/lava/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'src/amd/ci/gitlab-ci.yml'
@@ -312,14 +313,14 @@ debian/x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-ci-fairy"
+    MESA_IMAGE_TAG: &debian-x86_build-base ${DEBIAN_BASE_TAG}
 
 .use-debian/x86_build-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
-    MESA_BASE_IMAGE: "debian/x86_build-base"
+    MESA_BASE_IMAGE: ${DEBIAN_X86_BUILD_BASE_IMAGE}
     MESA_BASE_TAG: *debian-x86_build-base
     MESA_ARTIFACTS_BASE_TAG: *debian-x86_build-base
   needs:
@@ -330,14 +331,14 @@ debian/x86_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_build ${DEBIAN_BUILD_TAG}
 
 .use-debian/x86_build:
   extends:
     - .set-image-base-tag
   variables:
     MESA_BASE_TAG: *debian-x86_build-base
-    MESA_IMAGE_PATH: "debian/x86_build"
+    MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_IMAGE_PATH}
     MESA_IMAGE_TAG: *debian-x86_build
   needs:
     - debian/x86_build
@@ -347,7 +348,7 @@ debian/i386_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-i386_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-i386_build ${DEBIAN_BUILD_TAG}
 
 .use-debian/i386_build:
   extends:
@@ -364,7 +365,7 @@ debian/ppc64el_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-ppc64el_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
 
 .use-debian/ppc64el_build:
   extends:
@@ -381,7 +382,7 @@ debian/s390x_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-s390x_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-s390x_build ${DEBIAN_BUILD_TAG}
 
 .use-debian/s390x_build:
   extends:
@@ -398,7 +399,7 @@ debian/android_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-android_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
 
 .use-debian/android_build:
   extends:
@@ -414,14 +415,14 @@ debian/android_build:
 debian/x86_test-base:
   extends: debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-base "2022-01-06-piglit"
+    MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG}
 
 .use-debian/x86_test-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
-    MESA_BASE_IMAGE: "debian/x86_test-base"
+    MESA_BASE_IMAGE: ${DEBIAN_X86_TEST_BASE_IMAGE}
     MESA_BASE_TAG: *debian-x86_test-base
   needs:
     - debian/x86_test-base
@@ -432,13 +433,13 @@ debian/x86_test-gl:
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2022-01-07-shrink"
+    MESA_IMAGE_TAG: &debian-x86_test-gl ${DEBIAN_X86_TEST_GL_TAG}
 
 # Debian 11 based x86 test image for VK
 debian/x86_test-vk:
   extends: .use-debian/x86_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-vk "2022-01-08-piglit"
+    MESA_IMAGE_TAG: &debian-x86_test-vk ${DEBIAN_X86_TEST_VK_TAG}
 
 # Debian 11 based ARM build image
 debian/arm_build:
@@ -448,7 +449,7 @@ debian/arm_build:
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm_build "2021-11-25-ci-fairy"
+    MESA_IMAGE_TAG: &debian-arm_build ${DEBIAN_BASE_TAG}
 
 .use-debian/arm_build:
   extends:
@@ -468,7 +469,7 @@ fedora/x86_build:
     - .container
   variables:
     FDO_DISTRIBUTION_VERSION: 34
-    MESA_IMAGE_TAG: &fedora-x86_build "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &fedora-x86_build ${FEDORA_X86_BUILD_TAG}
 
 .use-fedora/x86_build:
   extends:
@@ -487,7 +488,7 @@ fedora/x86_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2022-01-08-piglit"
+    MESA_ROOTFS_TAG: &kernel-rootfs ${KERNEL_ROOTFS_TAG}
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
@@ -541,7 +542,7 @@ debian/arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test "2021-11-25-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_test ${DEBIAN_BASE_TAG}
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-debian/arm_test:
@@ -571,8 +572,8 @@ debian/arm_test:
     - .set-image
   variables:
     MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
-    MESA_IMAGE_PATH: "windows/x64_build"
-    MESA_IMAGE_TAG: "2021-11-19-piglit-uprev"
+    MESA_IMAGE_PATH: ${WINDOWS_X64_BUILD_PATH}
+    MESA_IMAGE_TAG: ${WINDOWS_X64_BUILD_TAG}
     MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
 
 windows_build_vs2019:
@@ -1184,7 +1185,7 @@ debian-mingw32-x86_64:
     - .set-image-base-tag
   variables:
     MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: "debian/x86_test-gl"
+    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH}
     MESA_IMAGE_TAG: *debian-x86_test-gl
   needs:
     - debian/x86_test-gl