OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: split & reuse debian version identifier

Browse Source 
It was set on non-debian containers, and it was missing on debian-based
rootfs containers.

Fixes: 4023301010 ("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>
This commit is contained in:
Eric Engestrom
2024-01-10 11:54:18 +00:00
committed by Marge Bot
parent 41cbd6f735
commit 0960fd5e8a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci/container/gitlab-ci.yml
View File

@@ -40,13 +40,16 @@
# repository's container registry, so that the image from the main # repository's container registry, so that the image from the main
# repository's registry will be used there as well. # repository's registry will be used there as well.
.debian-container:
variables:
FDO_DISTRIBUTION_VERSION: bookworm-slim
.container: .container:
stage: container stage: container
extends: extends:
- .container+build-rules - .container+build-rules
- .incorporate-templates-commit - .incorporate-templates-commit
variables: variables:
FDO_DISTRIBUTION_VERSION: bookworm-slim
FDO_REPO_SUFFIX: $CI_JOB_NAME FDO_REPO_SUFFIX: $CI_JOB_NAME
FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image # no need to pull the whole repo to build the container image
@@ -62,12 +65,14 @@ debian/x86_64_build-base:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
- .container - .container
- .debian-container
variables: variables:
MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
.use-debian/x86_64_build-base: .use-debian/x86_64_build-base:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
- .debian-container
- .use-base-image - .use-base-image
variables: variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE} MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
@@ -176,6 +181,7 @@ debian/x86_64_test-base:
.use-debian/x86_64_test-base: .use-debian/x86_64_test-base:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
- .debian-container
- .use-base-image - .use-base-image
variables: variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE} MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
@@ -237,6 +243,7 @@ debian/arm64_build:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
- .container - .container
- .debian-container
tags: tags:
- aarch64 - aarch64
variables: variables:
@@ -307,6 +314,7 @@ fedora/x86_64_build:
.kernel+rootfs: .kernel+rootfs:
extends: extends:
- .container+build-rules - .container+build-rules
- .debian-container
stage: container stage: container
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
@@ -355,6 +363,7 @@ kernel+rootfs_arm32:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
- .container - .container
- .debian-container
# Don't want the .container rules # Don't want the .container rules
- .container+build-rules - .container+build-rules
variables: variables:

4
.gitlab-ci/image-tags.yml
View File

@@ -7,7 +7,7 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" 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_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-12-27-libdrm" 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_BUILD_TAG: "2023-01-07-libdrm2_4_119"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm" 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_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "67f2c46b" PKG_REPO_REV: "67f2c46b"