Module: Mesa Branch: main Commit: 46ba0f0ffab3ea5532ca1dcf6cb0c2848aba9bd6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46ba0f0ffab3ea5532ca1dcf6cb0c2848aba9bd6
Author: Omar Akkila <[email protected]> Date: Wed Jul 28 17:42:33 2021 +0200 ci: Merge common builds in debian test jobs Co-authored-by: Corentin Noël <[email protected]> Signed-off-by: Omar Akkila <[email protected]> Acked-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15692> --- .gitlab-ci/container/debian/x86_test-base.sh | 8 ++++++++ .gitlab-ci/container/debian/x86_test-gl.sh | 9 --------- .gitlab-ci/container/debian/x86_test-vk.sh | 8 -------- .gitlab-ci/image-tags.yml | 8 ++++---- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 41e3b3c66f2..7b688f49530 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -71,6 +71,14 @@ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade9 . .gitlab-ci/container/build-deqp-runner.sh rm -rf ~/.cargo +############### Build libdrm + +. .gitlab-ci/container/build-libdrm.sh + +############### Build Wayland + +. .gitlab-ci/container/build-wayland.sh + apt-get purge -y $STABLE_EPHEMERAL apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index 33c7d0c4de2..708ac611682 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -24,7 +24,6 @@ STABLE_EPHEMERAL=" \ libclang-cpp13-dev \ libclang-cpp11-dev \ libelf-dev \ - libexpat1-dev \ libfdt-dev \ libgbm-dev \ libgles2-mesa-dev \ @@ -79,14 +78,6 @@ apt-get install -y --no-remove \ . .gitlab-ci/container/container_pre_build.sh -############### Build libdrm - -. .gitlab-ci/container/build-libdrm.sh - -############### Build Wayland - -. .gitlab-ci/container/build-wayland.sh - ############### Build Crosvm . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 77c80715ef5..6e007cb5615 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -150,14 +150,6 @@ wine \ . .gitlab-ci/container/container_pre_build.sh -############### Build libdrm - -. .gitlab-ci/container/build-libdrm.sh - -############### Build Wayland - -. .gitlab-ci/container/build-wayland.sh - ############### Build parallel-deqp-runner's hang-detection tool . .gitlab-ci/container/build-hang-detection.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a84b4dc31ec..06cb1c94e55 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-08-04-zstd" + DEBIAN_BASE_TAG: "2022-08-04-merge-common" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-08-04-zstd" @@ -11,11 +11,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-08-04-zstd" - DEBIAN_X86_TEST_VK_TAG: "2022-08-04-zstd" + DEBIAN_X86_TEST_GL_TAG: "2022-08-04-merge-common" + DEBIAN_X86_TEST_VK_TAG: "2022-08-04-merge-common" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-08-04-zstd" + KERNEL_ROOTFS_TAG: "2022-08-04-virgl-update" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"
