KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: install ci-fairy in the testing images 

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

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>
This commit is contained in:
Andres Gomez 2020-08-24 14:09:17 +03:00 committed by Marge Bot
parent ac03a9f715
commit 645e7b4b6c
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -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:

17
.gitlab-ci/container/x86_test-base.sh
View File

@ -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