gitlab-ci: Move meson back to x86_test-gl/vk ephemeral packages lists

And python3-distutils back to x86_test-gl's list.

These are not used for building Mesa, only for other components used in
test jobs.

This partially reverts commit c1a290bdd57536d6afcff6a02f1512fba7328729
"meson: Bump required version to 0.52.0".

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>

diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh
index 82be74c4a423469f67766f0ecaf077d651aa4dc1..4d631f8ea4881940a9dfd79dd4d407fc8972b3a5 100644 (file)
--- a/.gitlab-ci/container/x86_test-base.sh
+++ b/.gitlab-ci/container/x86_test-base.sh
@@ -39,7 +39,6 @@ apt-get install -y --no-remove \
       libxrandr2 \
       libxrender1 \
       python \
-      python3-distutils \
       python3-mako \
       python3-numpy \
       python3-pil \
@@ -59,7 +58,4 @@ apt-get install -y --no-remove \
 apt-get purge -y \
       gnupg
 
-apt-get install -t buster-backports -y --no-remove \
-    meson
-
 apt-get autoremove -y --purge

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 38e6e1e57e779d71625f659625fcca3af9d54967..daed59c6d334d618860e3888aa02ddcc15db1fc4 100644 (file)
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -22,8 +22,10 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrender-dev \
       make \
+      meson \
       patch \
       pkg-config \
+      python3-distutils \
       python3.7-dev \
       wget \
       xz-utils \

diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 204acc01398f27dcb0dfda261a5869908a8cfed6..4f8f306ee9fa275bddf4f6956101e8c93f92df5c 100644 (file)
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -20,6 +20,7 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
+      meson \
       p7zip \
       pkg-config \
       python3-distutils \