From eba962dda4c41bbe1cab12161b513b9de075c256 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 13 Feb 2021 21:33:14 +0200 Subject: [PATCH] ci: remove pytest since we don't need it any more Signed-off-by: Andres Gomez Reviewed-by: Christian Gmeiner Reviewed-by: Juan A. Suarez Part-of: --- .gitlab-ci.yml | 10 +++++----- .gitlab-ci/container/create-rootfs.sh | 1 - .gitlab-ci/container/x86_test-base.sh | 1 - .gitlab-ci/lava-gitlab-ci.yml | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb63bc341fc..16ae9420e45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 0e13dc3191d..3d6215cf444 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -67,7 +67,6 @@ apt-get -y install --no-install-recommends \ netcat-openbsd \ python3 \ python3-pil \ - python3-pytest \ python3-requests \ python3-yaml \ sntp \ diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh index c60e0cd8664..e5f5cc72c79 100644 --- a/.gitlab-ci/container/x86_test-base.sh +++ b/.gitlab-ci/container/x86_test-base.sh @@ -54,7 +54,6 @@ apt-get install -y --no-remove \ python3-mako \ python3-numpy \ python3-pil \ - python3-pytest \ python3-requests \ python3-six \ python3-yaml \ diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 96b1baa24c4..e33bc4d2905 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -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