Mesa (main): ci: remove unzip from several containers that don't use it at all

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 98474055d73005c87df50631f6b58b55d10af39f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=98474055d73005c87df50631f6b58b55d10af39f

Author: Andres Gomez <agomez at igalia.com>
Date:   Tue Jun  1 13:37:54 2021 +0300

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

Signed-off-by: Andres Gomez <agomez at igalia.com>
Acked-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11110>

---

 .gitlab-ci.yml                         | 10 +++++-----
 .gitlab-ci/container/arm_build.sh      |  1 -
 .gitlab-ci/container/arm_test.sh       |  1 -
 .gitlab-ci/container/x86_build-base.sh |  1 -
 .gitlab-ci/container/x86_build.sh      |  1 -
 .gitlab-ci/container/x86_test-vk.sh    |  1 -
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e017bd7ede..d3dd005cd17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -301,7 +301,7 @@ x86_build-base:
     - .fdo.container-build at 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:
diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 438e7ef984d..1ada5682bce 100644
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -50,7 +50,6 @@ apt-get -y install \
 	python3-requests \
 	python3-setuptools \
 	u-boot-tools \
-	unzip \
 	wget \
 	xz-utils \
 	zlib1g-dev
diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh
index 82744afd4db..a8b7579f746 100644
--- a/.gitlab-ci/container/arm_test.sh
+++ b/.gitlab-ci/container/arm_test.sh
@@ -21,7 +21,6 @@ apt-get install -y --no-remove \
         python3-serial \
         rsync \
         snmp \
-        unzip \
         wget
 
 # setup nginx
diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index 7f9bef01a27..26defedb940 100644
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -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
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index c32011e58d1..318a0bc490c 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -15,7 +15,6 @@ STABLE_EPHEMERAL=" \
       libgbm-dev \
       libtool \
       python3-pip \
-      unzip \
       "
 
 # We need multiarch for Wine
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 447e2338e98..6f0b049f1bc 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -36,7 +36,6 @@ STABLE_EPHEMERAL=" \
       patch \
       pkg-config \
       python3-distutils \
-      unzip \
       wget \
       xz-utils \
       "