Module: Mesa Branch: main Commit: 402330101009754f32ce05a7a59b92f35869b1e1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=402330101009754f32ce05a7a59b92f35869b1e1
Author: David Heidelberg <[email protected]> Date: Tue Dec 26 02:26:07 2023 +0100 ci: enable ci-deb-repo for libdrm 2.4.119 (and others in the future) Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26814> --- .gitlab-ci/container/cross_build.sh | 5 +++-- .gitlab-ci/container/debian/arm64_build.sh | 1 + .gitlab-ci/container/debian/arm_test.sh | 1 + .gitlab-ci/container/debian/x86_64_build-base.sh | 1 + .gitlab-ci/container/debian/x86_64_test-base.sh | 2 ++ .gitlab-ci/container/gitlab-ci.yml | 10 +++++----- .gitlab-ci/container/lava_build.sh | 2 ++ .gitlab-ci/image-tags.yml | 5 +++-- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index 425fa2a9e8c..8d22ba0d5a0 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -40,6 +40,9 @@ DEPS=( ) dpkg --add-architecture $arch + +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list + apt-get update apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ @@ -72,8 +75,6 @@ fi # dependencies where we want a specific version MULTIARCH_PATH=$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH) export EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/${MULTIARCH_PATH}" -. .gitlab-ci/container/build-libdrm.sh - . .gitlab-ci/container/build-wayland.sh . .gitlab-ci/container/build-directx-headers.sh diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index f1e950a2648..54a18558a99 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -8,6 +8,7 @@ export LLVM_VERSION="${LLVM_VERSION:=15}" apt-get -y install ca-certificates sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/* +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list apt-get update # Ephemeral packages (installed for this script and removed again at the end) diff --git a/.gitlab-ci/container/debian/arm_test.sh b/.gitlab-ci/container/debian/arm_test.sh index 855c7ea6fc3..c4f35a3d470 100644 --- a/.gitlab-ci/container/debian/arm_test.sh +++ b/.gitlab-ci/container/debian/arm_test.sh @@ -28,6 +28,7 @@ DEPS=( apt-get install -y ca-certificates sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/* +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list apt-get update apt-get install -y --no-remove "${DEPS[@]}" diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index 2cbc30704e2..bb451fcdf82 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -13,6 +13,7 @@ export LLVM_VERSION="${LLVM_VERSION:=15}" apt-get install -y ca-certificates sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/* +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list # Ephemeral packages (installed for this script and removed again at # the end) diff --git a/.gitlab-ci/container/debian/x86_64_test-base.sh b/.gitlab-ci/container/debian/x86_64_test-base.sh index 64a7680bfc6..586f7c5f46c 100644 --- a/.gitlab-ci/container/debian/x86_64_test-base.sh +++ b/.gitlab-ci/container/debian/x86_64_test-base.sh @@ -14,6 +14,8 @@ apt-get install -y ca-certificates gnupg2 software-properties-common sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/* +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list + export LLVM_VERSION="${LLVM_VERSION:=15}" # Ephemeral packages (installed for this script and removed again at the end) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 02d3464b531..dabf7875938 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -63,7 +63,7 @@ debian/x86_64_build-base: - .fdo.container-build@debian - .container variables: - MESA_IMAGE_TAG: &debian-x86_64_build-base ${DEBIAN_BASE_TAG} + MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" .use-debian/x86_64_build-base: extends: @@ -171,7 +171,7 @@ debian/android_build: debian/x86_64_test-base: extends: debian/x86_64_build-base variables: - MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${KERNEL_TAG}" + MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_TAG}" .use-debian/x86_64_test-base: extends: @@ -240,7 +240,7 @@ debian/arm64_build: tags: - aarch64 variables: - MESA_IMAGE_TAG: &debian-arm64_build ${DEBIAN_BASE_TAG} + MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" .use-debian/arm64_build: extends: @@ -369,7 +369,7 @@ debian/arm32_test: needs: - kernel+rootfs_arm32 variables: - MESA_IMAGE_TAG: &debian-arm32_test ${DEBIAN_BASE_TAG} + MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" debian/arm64_test: extends: @@ -377,7 +377,7 @@ debian/arm64_test: needs: - kernel+rootfs_arm64 variables: - MESA_IMAGE_TAG: &debian-arm64_test ${DEBIAN_BASE_TAG} + MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" .use-debian/arm_test: variables: diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 0b131201b0e..4159190d9ef 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -147,6 +147,8 @@ CONTAINER_EPHEMERAL=( zstd ) +echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list + apt-get update apt-get install -y --no-remove \ -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 91cf83b4634..1a803a0832d 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-05-meson-bump" + DEBIAN_BASE_TAG: "2024-01-06-libdrm" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-12-27-libdrm" @@ -25,9 +25,10 @@ variables: ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2024-01-05-meson-bump" - KERNEL_ROOTFS_TAG: "2023-12-22-vkcts" + KERNEL_ROOTFS_TAG: "2024-01-06-libdrm" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" + PKG_REPO_REV: "67f2c46b" WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc" WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc"
