Module: Mesa
Branch: main
Commit: 0960fd5e8a49e143497f8880ad0e0cd1c4e93d6f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0960fd5e8a49e143497f8880ad0e0cd1c4e93d6f
Author: Eric Engestrom <e...@igalia.com>
Date: Wed Jan 10 11:54:18 2024 +0000
ci: split & reuse debian version identifier
It was set on non-debian containers, and it was missing on debian-based
rootfs containers.
Fixes: 402330101009754f32ce ("ci: enable ci-deb-repo for libdrm 2.4.119 (and
others in the future)")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26971>
---
.gitlab-ci/container/gitlab-ci.yml | 11 ++++++++++-
.gitlab-ci/image-tags.yml | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci/container/gitlab-ci.yml
b/.gitlab-ci/container/gitlab-ci.yml
index 041fa273741..d5a16eba78d 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -40,13 +40,16 @@
# repository's container registry, so that the image from the main
# repository's registry will be used there as well.
+.debian-container:
+ variables:
+ FDO_DISTRIBUTION_VERSION: bookworm-slim
+
.container:
stage: container
extends:
- .container+build-rules
- .incorporate-templates-commit
variables:
- FDO_DISTRIBUTION_VERSION: bookworm-slim
FDO_REPO_SUFFIX: $CI_JOB_NAME
FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image
@@ -62,12 +65,14 @@ debian/x86_64_build-base:
extends:
- .fdo.container-build@debian
- .container
+ - .debian-container
variables:
MESA_IMAGE_TAG: &debian-x86_64_build-base
"${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
.use-debian/x86_64_build-base:
extends:
- .fdo.container-build@debian
+ - .debian-container
- .use-base-image
variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
@@ -176,6 +181,7 @@ debian/x86_64_test-base:
.use-debian/x86_64_test-base:
extends:
- .fdo.container-build@debian
+ - .debian-container
- .use-base-image
variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
@@ -237,6 +243,7 @@ debian/arm64_build:
extends:
- .fdo.container-build@debian
- .container
+ - .debian-container
tags:
- aarch64
variables:
@@ -307,6 +314,7 @@ fedora/x86_64_build:
.kernel+rootfs:
extends:
- .container+build-rules
+ - .debian-container
stage: container
variables:
GIT_STRATEGY: fetch
@@ -355,6 +363,7 @@ kernel+rootfs_arm32:
extends:
- .fdo.container-build@debian
- .container
+ - .debian-container
# Don't want the .container rules
- .container+build-rules
variables:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index ee8e911af25..e877dd80264 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -7,7 +7,7 @@
variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
- DEBIAN_BASE_TAG: "2024-01-06-libdrm"
+ DEBIAN_BASE_TAG: "2024-01-10-deb-fix"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-12-27-libdrm"
@@ -25,7 +25,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
- KERNEL_ROOTFS_TAG: "2024-01-06-libdrm"
+ KERNEL_ROOTFS_TAG: "2024-01-10-deb-fix"
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "67f2c46b"
