openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-12-03 13:13:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: remove pytest since we don't need it any more

Browse Source 
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9032>
This commit is contained in:
Andres Gomez 2021-02-13 21:33:14 +02:00 committed by Marge Bot
parent 6f729a7c9d
commit eba962dda4
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -384,7 +384,7 @@ android_build:
x86_test-base:
extends: x86_build-base
variables:
MESA_IMAGE_TAG: &x86_test-base "2021-02-08-container-reorg"
MESA_IMAGE_TAG: &x86_test-base "2021-02-17-remove-pytest"
.use-x86_test-base:
extends:
@ -400,13 +400,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-gl "2021-02-11-vkglcts-1.2.5.1"
MESA_IMAGE_TAG: &x86_test-gl "2021-02-17-remove-pytest"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-02-11-vkglcts-1.2.5.1"
MESA_IMAGE_TAG: &x86_test-vk "2021-02-17-remove-pytest"
# Debian 10 based ARM build image
arm_build:
@ -448,7 +448,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &arm64_test "2021-02-15-kernel"
MESA_IMAGE_TAG: &arm64_test "2021-02-17-remove-pytest"
.use-arm64_test:
extends:
@ -465,7 +465,7 @@ armhf_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &armhf_test "2021-02-15-kernel"
MESA_IMAGE_TAG: &armhf_test "2021-02-17-remove-pytest"
.use-armhf_test:
extends:

1
.gitlab-ci/container/create-rootfs.sh
View File

@ -67,7 +67,6 @@ apt-get -y install --no-install-recommends \
netcat-openbsd \
python3 \
python3-pil \
python3-pytest \
python3-requests \
python3-yaml \
sntp \

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

@ -54,7 +54,6 @@ apt-get install -y --no-remove \
python3-mako \
python3-numpy \
python3-pil \
python3-pytest \
python3-requests \
python3-six \
python3-yaml \

2
.gitlab-ci/lava-gitlab-ci.yml
View File

@ -1,5 +1,5 @@
variables:
MESA_LAVA_TAG: "2020-02-16-iris"
MESA_LAVA_TAG: "2020-02-17-remove-pytest"
.kernel+rootfs:
stage: container-2