Module: Mesa Branch: master Commit: ac03a9f715c37c8664e91734f268fdc5f7f04dec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac03a9f715c37c8664e91734f268fdc5f7f04dec
Author: Andres Gomez <[email protected]> Date: Mon Aug 24 21:56:41 2020 +0300 ci: use ephemeral packages when building the build-base image v2: - Update tag for the android_build image (Michel). Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> [v1] Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388> --- .gitlab-ci.yml | 12 ++++++------ .gitlab-ci/container/x86_build-base.sh | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 886d153840c..d5886d7d47d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,7 +259,7 @@ x86_build-base: - .fdo.container-build@debian - .container variables: - MESA_IMAGE_TAG: &x86_build-base "2020-12-09-sanitizers" + MESA_IMAGE_TAG: &x86_build-base "2020-12-17-use-ephemeral" .use-x86_build-base: extends: @@ -276,7 +276,7 @@ x86_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &x86_build "2020-12-16-cmake" + MESA_IMAGE_TAG: &x86_build "2020-12-17-use-ephemeral" .use-x86_build: variables: @@ -290,7 +290,7 @@ i386_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &i386_build "2020-12-09-sanitizers" + MESA_IMAGE_TAG: &i386_build "2020-12-17-use-ephemeral" .use-i386_build: variables: @@ -304,7 +304,7 @@ ppc64el_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &ppc64el_build "2020-12-09-sanitizers" + MESA_IMAGE_TAG: &ppc64el_build "2020-12-17-use-ephemeral" .use-ppc64el_build: variables: @@ -318,7 +318,7 @@ s390x_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &s390x_build "2020-12-09-sanitizers" + MESA_IMAGE_TAG: &s390x_build "2020-12-17-use-ephemeral" .use-s390x_build: variables: @@ -332,7 +332,7 @@ android_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &android_build "2020-12-09-sanitizers" + MESA_IMAGE_TAG: &android_build "2020-12-17-use-ephemeral" .use-android_build: variables: diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh index ceb06373169..5476ced35f7 100644 --- a/.gitlab-ci/container/x86_build-base.sh +++ b/.gitlab-ci/container/x86_build-base.sh @@ -7,11 +7,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get install -y \ ca-certificates \ - gnupg \ - python3-pip \ - python3-setuptools \ - unzip \ - wget + gnupg # Upstream LLVM package repository apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key @@ -21,6 +17,14 @@ 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-pip \ + python3-setuptools \ + unzip \ + " + apt-get update apt-get install -y --no-remove \ @@ -64,12 +68,11 @@ apt-get install -y --no-remove \ python-mako \ python3-mako \ python3-pil \ - python3-pip \ python3-requests \ - python3-setuptools \ qemu-user \ scons \ valgrind \ + wget \ wine64-development \ x11proto-dri2-dev \ x11proto-gl-dev \ @@ -95,7 +98,7 @@ rm bin/glslangValidator glslang-master-linux-Release.zip ############### Uninstall ephemeral packages apt-get purge -y \ - gnupg \ - unzip + $STABLE_EPHEMERAL \ + gnupg . .gitlab-ci/container/container_post_build.sh _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
