Module: Mesa Branch: main Commit: 6d2be8467255aa61ed98ae26630557acab63e8c3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d2be8467255aa61ed98ae26630557acab63e8c3
Author: Matt Turner <[email protected]> Date: Wed Oct 18 13:53:30 2023 -0400 ci/lava: Add firmware-misc-nonfree on amd64 Hopefully this provides the GuC firmware files we need for testing on Intel ADL+ boards. Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9841 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25792> --- .gitlab-ci/container/lava_build.sh | 6 ++++++ .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 752ef0b48d8..0b131201b0e 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -194,6 +194,7 @@ PKG_DEP=( ) [ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=( firmware-amd-graphics + firmware-misc-nonfree libgl1 libglu1-mesa inetutils-syslogd iptables libcap2 libfontconfig1 @@ -320,6 +321,11 @@ fi rm -rf /root/.cargo rm -rf /root/.rustup +############### Delete firmware files we don't need +if [ "$DEBIAN_ARCH" = "amd64" ]; then + dpkg -L firmware-misc-nonfree | grep -v "i915" | xargs rm || true +fi + ############### Fill rootfs cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/. diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7cccc8c6bfc..6f7b576dd33 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -25,7 +25,7 @@ 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: "2023-10-30-ci-improv" - KERNEL_ROOTFS_TAG: "2023-12-08-vkd3d" + KERNEL_ROOTFS_TAG: "2023-12-08-firmware" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux"
