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

gitlab-ci: stop installing python-is-python3 package 

Suggested-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3674>
This commit is contained in:
Eric Engestrom 2020-08-06 16:24:31 +02:00 committed by Marge Bot
parent 6f854145d2
commit dac09a3119
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -285,7 +285,7 @@ debian/x86_build-base:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-26-python"
.use-debian/x86_build-base:
extends:
@ -387,7 +387,7 @@ debian/android_build:
debian/x86_test-base:
extends: debian/x86_build-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-30-deqp-runner"
MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-26-python"
.use-debian/x86_test-base:
extends:
@ -421,7 +421,7 @@ debian/arm_build:
tags:
- aarch64
variables:
MESA_IMAGE_TAG: &debian-arm_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-arm_build "2021-07-26-python"
.use-debian/arm_build:
extends:
@ -515,7 +515,7 @@ debian/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: *debian-arm_build
MESA_IMAGE_TAG: &debian-arm_test "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-arm_test "2021-07-26-python"
MESA_ROOTFS_TAG: *kernel-rootfs
.use-debian/arm_test:

1
.gitlab-ci/container/debian/arm_build.sh
View File

@ -43,7 +43,6 @@ apt-get -y install \
llvm-11-dev \
meson \
pkg-config \
python-is-python3 \
python3-mako \
python3-pil \
python3-pip \

1
.gitlab-ci/container/debian/arm_test.sh
View File

@ -14,7 +14,6 @@ apt-get install -y --no-remove \
fastboot \
netcat \
procps \
python-is-python3 \
python3-distutils \
python3-minimal \
python3-serial \

1
.gitlab-ci/container/debian/x86_build-base.sh
View File

@ -58,7 +58,6 @@ apt-get install -y --no-remove \
make \
meson \
pkg-config \
python-is-python3 \
python3-mako \
python3-pil \
python3-requests \

1
.gitlab-ci/container/debian/x86_test-base.sh
View File

@ -41,7 +41,6 @@ apt-get install -y --no-remove \
libxkbcommon0 \
libxrandr2 \
libxrender1 \
python-is-python3 \
python3-mako \
python3-numpy \
python3-packaging \