ci: remove unzip from several containers that don't use it at all

Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11110>
This commit is contained in:
Andres Gomez 2021-06-01 13:37:54 +03:00 committed by Marge Bot
parent a6e0650d9c
commit 98474055d7
6 changed files with 5 additions and 10 deletions

View File

@ -301,7 +301,7 @@ x86_build-base:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &x86_build-base "2021-05-31-glslang-tools"
MESA_IMAGE_TAG: &x86_build-base "2021-06-11-remove-unzip"
.use-x86_build-base:
extends:
@ -319,7 +319,7 @@ x86_build:
extends:
- .use-x86_build-base
variables:
MESA_IMAGE_TAG: &x86_build "2021-06-02-lava-x86"
MESA_IMAGE_TAG: &x86_build "2021-06-11-remove-unzip"
.use-x86_build:
extends:
@ -427,7 +427,7 @@ x86_test-gl:
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-06-09-piglit"
MESA_IMAGE_TAG: &x86_test-vk "2021-06-11-remove-unzip"
# Debian 11 based ARM build image
arm_build:
@ -437,7 +437,7 @@ arm_build:
tags:
- aarch64
variables:
MESA_IMAGE_TAG: &arm_build "2021-06-01-lava-x86"
MESA_IMAGE_TAG: &arm_build "2021-06-11-remove-unzip"
.use-arm_build:
extends:
@ -511,7 +511,7 @@ arm_test:
FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARM_BUILD_TAG: *arm_build
MESA_IMAGE_TAG: &arm_test "2021-04-20-kernel-modules"
MESA_IMAGE_TAG: &arm_test "2021-06-11-remove-unzip"
MESA_ROOTFS_TAG: *kernel-rootfs
.use-arm_test:

View File

@ -50,7 +50,6 @@ apt-get -y install \
python3-requests \
python3-setuptools \
u-boot-tools \
unzip \
wget \
xz-utils \
zlib1g-dev

View File

@ -21,7 +21,6 @@ apt-get install -y --no-remove \
python3-serial \
rsync \
snmp \
unzip \
wget
# setup nginx

View File

@ -14,7 +14,6 @@ sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
STABLE_EPHEMERAL=" \
python3-pip \
python3-setuptools \
unzip \
"
apt-get update

View File

@ -15,7 +15,6 @@ STABLE_EPHEMERAL=" \
libgbm-dev \
libtool \
python3-pip \
unzip \
"
# We need multiarch for Wine

View File

@ -36,7 +36,6 @@ STABLE_EPHEMERAL=" \
patch \
pkg-config \
python3-distutils \
unzip \
wget \
xz-utils \
"