Mesa (master): ci: install ci-fairy in the testing images

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 645e7b4b6c9d76e4b258bb94b6e7bc36135f1276
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=645e7b4b6c9d76e4b258bb94b6e7bc36135f1276

Author: Andres Gomez <agomez at igalia.com>
Date:   Mon Aug 24 14:09:17 2020 +0300

ci: install ci-fairy in the testing images

v2:
  - Updated the ci-fairy commit to use.

Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>

---

 .gitlab-ci.yml                        |  6 +++---
 .gitlab-ci/container/x86_test-base.sh | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5886d7d47d..25dc14b1c7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,7 +345,7 @@ android_build:
 x86_test-base:
   extends: x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-base "2020-12-09-sanitizers"
+    MESA_IMAGE_TAG: &x86_test-base "2020-12-17-install-ci-fairy"
 
 .use-x86_test-base:
   extends:
@@ -361,13 +361,13 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2020-12-16-cmake"
+    MESA_IMAGE_TAG: &x86_test-gl "2020-12-17-install-ci-fairy"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-vk "2020-12-16-cmake"
+    MESA_IMAGE_TAG: &x86_test-vk "2020-12-17-install-ci-fairy"
 
 # Debian 10 based ARM build image
 arm_build:
diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh
index cd983b3562e..fd4cb7eca4c 100644
--- a/.gitlab-ci/container/x86_test-base.sh
+++ b/.gitlab-ci/container/x86_test-base.sh
@@ -17,6 +17,15 @@ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 
+# Ephemeral packages (installed for this script and removed again at
+# the end)
+STABLE_EPHEMERAL=" \
+      python3-dev \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      "
+
 apt-get update
 apt-get dist-upgrade -y
 
@@ -57,7 +66,15 @@ apt-get install -y --no-remove \
       xvfb \
       zlib1g
 
+apt-get install -y --no-install-recommends \
+      $STABLE_EPHEMERAL
+
+# 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@0f1abc24c043e63894085a6bd12f14263e8b29eb
+
 apt-get purge -y \
+      $STABLE_EPHEMERAL \
       gnupg
 
 apt-get autoremove -y --purge