Module: Mesa Branch: master Commit: ef36de243c2be34a4d285c410a116bd3b22b27a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef36de243c2be34a4d285c410a116bd3b22b27a1
Author: Erik Faye-Lund <[email protected]> Date: Tue Feb 9 18:28:17 2021 +0100 ci: make sure all lava-builders have libvulkan In the next commit, we'll start building Zink in the meson-testing step, and because mega-drivers end up stuffing all dependencies in the same shared-object, we end up requiring libvulkan for other drivers as well. So let's no longer track separately who needs vulkan and who doesn't, and just always install it. Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8879> --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/baremetal_build.sh | 2 +- .gitlab-ci/container/create-rootfs.sh | 5 +---- .gitlab-ci/lava-gitlab-ci.yml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57bdce6f9ed..ea3ccd4fd48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -450,7 +450,7 @@ arm64_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &arm64_test "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &arm64_test "2021-02-10-zink" .use-arm64_test: extends: @@ -467,7 +467,7 @@ armhf_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &armhf_test "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &armhf_test "2021-02-10-zink" .use-armhf_test: extends: diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index e3a4b246eb3..b3f5cb01a01 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -54,7 +54,7 @@ mkdir /var/cache/apt/archives/$arch ############### Create rootfs KERNEL_URL=https://github.com/anholt/linux/archive/mesa-ci-2021-01-27-5.11rc5.tar.gz -DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh +DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_build.sh ############### Uninstall the build software diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 72cdae20810..0e13dc3191d 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -17,10 +17,6 @@ elif [ $DEBIAN_ARCH = amd64 ]; then " fi -if [ -n "$INCLUDE_VK_CTS" ]; then - VK_CTS_PACKAGES="libvulkan1" -fi - if [ -n "$INCLUDE_PIGLIT" ]; then PIGLIT_PACKAGES="libwaffle-1-0 libxkbcommon0 @@ -50,6 +46,7 @@ apt-get -y install --no-install-recommends \ libpng16-16 \ libpython3.7 \ libsensors5 \ + libvulkan1 \ libwaffle-1-0 \ libx11-6 \ libx11-xcb1 \ diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 6fbd96edbde..1322e1e5f00 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - MESA_LAVA_TAG: "2021-02-08-subdir-move" + MESA_LAVA_TAG: "2021-02-10-zink" .kernel+rootfs: stage: container-2 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
