Module: Mesa Branch: main Commit: 486a24c520d857d3ba995dd8686c992f1d512d31 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=486a24c520d857d3ba995dd8686c992f1d512d31
Author: Omar Akkila <[email protected]> Date: Fri Oct 22 14:34:59 2021 +0200 ci: Move crosvm to the base test image This allows crosvm to be used in the test-gl and test-vk images 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 | 64 +++++++++++++++++++++++++--- .gitlab-ci/container/debian/x86_test-gl.sh | 33 +------------- .gitlab-ci/container/debian/x86_test-vk.sh | 1 + .gitlab-ci/container/gitlab-ci.yml | 4 +- .gitlab-ci/image-tags.yml | 6 +-- 5 files changed, 67 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 7b688f49530..5078ffca695 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -12,11 +12,38 @@ sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list # Ephemeral packages (installed for this script and removed again at # the end) STABLE_EPHEMERAL=" \ - cargo \ + autoconf \ + automake \ + bc \ + bison \ + bzip2 \ + ccache \ + clang-11 \ + flex \ + glslang-tools \ + g++ \ + libasound2-dev \ + libcap-dev \ + libclang-cpp11-dev \ + libegl-dev \ + libelf-dev \ + libepoxy-dev \ + libgbm-dev \ + libpciaccess-dev \ + libvulkan-dev \ + libwayland-dev \ + libx11-xcb-dev \ + libxext-dev \ + make \ + meson \ + patch \ + pkg-config \ python3-dev \ python3-pip \ python3-setuptools \ python3-wheel \ + wayland-protocols \ + xz-utils \ " # Add llvm 13 to the build image @@ -29,6 +56,8 @@ apt-get dist-upgrade -y apt-get install -y --no-remove \ git \ git-lfs \ + inetutils-syslogd \ + iptables \ libasan6 \ libexpat1 \ libllvm13 \ @@ -53,8 +82,11 @@ apt-get install -y --no-remove \ python3-requests \ python3-six \ python3-yaml \ + socat \ + sysvinit-core \ vulkan-tools \ waffle-utils \ + wget \ xauth \ xvfb \ zlib1g \ @@ -63,14 +95,23 @@ apt-get install -y --no-remove \ apt-get install -y --no-install-recommends \ $STABLE_EPHEMERAL + +. .gitlab-ci/container/container_pre_build.sh + +############### Build kernel + +export DEFCONFIG="arch/x86/configs/x86_64_defconfig" +export KERNEL_IMAGE_NAME=bzImage +export KERNEL_ARCH=x86_64 +export DEBIAN_ARCH=amd64 + +mkdir -p /lava-files/ +. .gitlab-ci/container/build-kernel.sh + # Needed for ci-fairy, this revision is able to upload files to MinIO # and doesn't depend on git pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 -############### Build dEQP runner -. .gitlab-ci/container/build-deqp-runner.sh -rm -rf ~/.cargo - ############### Build libdrm . .gitlab-ci/container/build-libdrm.sh @@ -79,6 +120,19 @@ rm -rf ~/.cargo . .gitlab-ci/container/build-wayland.sh +############### Build Crosvm + +. .gitlab-ci/container/build-rust.sh +. .gitlab-ci/container/build-crosvm.sh + +############### Build dEQP runner +. .gitlab-ci/container/build-deqp-runner.sh + +rm -rf /root/.cargo +rm -rf /root/.rustup + +ccache --show-stats + 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 708ac611682..d4fc8b32460 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -7,25 +7,17 @@ export DEBIAN_FRONTEND=noninteractive # Ephemeral packages (installed for this script and removed again at the end) STABLE_EPHEMERAL=" \ - autoconf \ - automake \ - bc \ - bison \ bzip2 \ ccache \ clang-13 \ clang-11 \ cmake \ - flex \ g++ \ glslang-tools \ libasound2-dev \ libcap-dev \ libclang-cpp13-dev \ libclang-cpp11-dev \ - libelf-dev \ - libfdt-dev \ - libgbm-dev \ libgles2-mesa-dev \ libllvmspirvlib-dev \ libpciaccess-dev \ @@ -35,7 +27,6 @@ STABLE_EPHEMERAL=" \ libwaffle-dev \ libx11-xcb-dev \ libxcb-dri2-0-dev \ - libxext-dev \ libxkbcommon-dev \ libxrender-dev \ llvm-13-dev \ @@ -62,7 +53,7 @@ apt-get install -y --no-remove \ libclang-cpp11 \ libcap2 \ libegl1 \ - libepoxy-dev \ + libepoxy0 \ libfdt1 \ libllvmspirvlib11 \ libxcb-shm0 \ @@ -70,31 +61,11 @@ apt-get install -y --no-remove \ python3-lxml \ python3-renderdoc \ python3-simplejson \ - socat \ - spirv-tools \ - sysvinit-core \ - wget + spirv-tools . .gitlab-ci/container/container_pre_build.sh -############### Build Crosvm - -. .gitlab-ci/container/build-rust.sh -. .gitlab-ci/container/build-crosvm.sh -rm -rf /root/.cargo -rm -rf /root/.rustup - -############### Build kernel - -export DEFCONFIG="arch/x86/configs/x86_64_defconfig" -export KERNEL_IMAGE_NAME=bzImage -export KERNEL_ARCH=x86_64 -export DEBIAN_ARCH=amd64 - -mkdir -p /lava-files/ -. .gitlab-ci/container/build-kernel.sh - ############### Build libclc . .gitlab-ci/container/build-libclc.sh diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 6e007cb5615..a58e5b2409f 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -51,6 +51,7 @@ STABLE_EPHEMERAL=" \ apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ + libepoxy0 \ libxcb-shm0 \ pciutils \ python3-lxml \ diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 497939bb7ee..f341e9ed91b 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -189,6 +189,8 @@ debian/android_build: debian/x86_test-base: extends: debian/x86_build-base variables: + FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.17-for-mesa-ci-b78f7870d97b/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2"; MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG} .use-debian/x86_test-base: @@ -205,8 +207,6 @@ debian/x86_test-base: debian/x86_test-gl: extends: .use-debian/x86_test-base variables: - FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' - KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.17-for-mesa-ci-b78f7870d97b/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2"; MESA_IMAGE_TAG: &debian-x86_test-gl ${DEBIAN_X86_TEST_GL_TAG} .use-debian/x86_test-gl: diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 06cb1c94e55..974510ea6f1 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-merge-common" + DEBIAN_BASE_TAG: "2022-08-04-crosvm-base" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-08-04-zstd" @@ -11,8 +11,8 @@ 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-merge-common" - DEBIAN_X86_TEST_VK_TAG: "2022-08-04-merge-common" + DEBIAN_X86_TEST_GL_TAG: "2022-08-04-crosvm-base" + DEBIAN_X86_TEST_VK_TAG: "2022-08-04-crosvm-base" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" KERNEL_ROOTFS_TAG: "2022-08-04-virgl-update"
