diff options
| author | Emma Anholt <emma@anholt.net> | 2022-01-07 09:44:43 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-01-07 22:32:31 +0000 |
| commit | a2dbdc645f04ddf7a0e464f10cad4ec0ba7218ae (patch) | |
| tree | 1cef2c7ed567d4c9fbeedf6ab5ceb692d0a35d5e /.gitlab-ci.yml | |
| parent | 48712b8cc5943af9c319ec4d714c00f9f5fe8825 (diff) | |
ci: Shrink container/rootfs sizes.
Cutting the extra VK mustpass files is 315MB out of 1.5GB of the amd64
rootfs. pip was 10MB. The rustup toolchains were massive (over a GB
IIRC) on the x86 container images.
Hopefully helps with #5837
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14460>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3ce16dd23a..a00162a606d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,13 +432,13 @@ debian/x86_test-gl: 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.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2" - MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-ci-fairy" + MESA_IMAGE_TAG: &debian-x86_test-gl "2022-01-07-shrink" # Debian 11 based x86 test image for VK debian/x86_test-vk: extends: .use-debian/x86_test-base variables: - MESA_IMAGE_TAG: &debian-x86_test-vk "2021-12-02-piglit" + MESA_IMAGE_TAG: &debian-x86_test-vk "2022-01-07-shrink" # Debian 11 based ARM build image debian/arm_build: @@ -487,7 +487,7 @@ fedora/x86_build: variables: GIT_STRATEGY: fetch KERNEL_URL: *kernel-rootfs-url - MESA_ROOTFS_TAG: &kernel-rootfs "2021-12-22-skqp" + MESA_ROOTFS_TAG: &kernel-rootfs "2022-01-07-shrink" DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}" script: - .gitlab-ci/container/lava_build.sh |