diff options
| author | Eric Anholt <eric@anholt.net> | 2020-05-22 19:58:50 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-29 16:46:44 +0000 |
| commit | 9c9ade468598e9c177612e5fc0860aa8b9b39b1d (patch) | |
| tree | 629d4607d60ea43714746a813707b1d3d2e7076c | |
| parent | 6f4fc4ff71524d55f6b481e4580c377d3c5f3b66 (diff) | |
ci: Don't build an arm_test container now that the last user is gone.
db410c and cheza used to use it, and now both are on baremetal.
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5247>
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .gitlab-ci/container/arm_test.sh | 72 |
2 files changed, 0 insertions, 88 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5b2e4eab67..0633e74ed78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,22 +217,6 @@ x86_cross_arm_test: needs: - x86_cross_arm_test - -# Debian 10 based ARM test image -arm_test: - extends: arm_build - variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags" - -.use-arm_test: - variables: - TAG: *arm_test - image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" - needs: - - arm_build - - meson-arm64 - - arm_test - # Native Windows docker builds # # Unlike the above Linux-based builds - including MinGW/SCons builds which diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh deleted file mode 100644 index 36f85490b1b..00000000000 --- a/.gitlab-ci/container/arm_test.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -set -e -set -o xtrace - -############### Install packages for building -apt-get -y install ca-certificates -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 -apt-get update -apt-get -y install \ - bzip2 \ - ccache \ - cmake \ - g++ \ - gcc \ - git \ - libc6-dev \ - libdrm-nouveau2 \ - libexpat1 \ - libgbm-dev \ - libgbm-dev \ - libgles2-mesa-dev \ - libllvm8 \ - libpng16-16 \ - libpng-dev \ - libvulkan-dev \ - libvulkan1 \ - meson \ - netcat \ - pkg-config \ - procps \ - python \ - python3-distutils \ - waffle-utils \ - wget \ - zlib1g - -. .gitlab-ci/container/container_pre_build.sh - -############### Build dEQP runner - -. .gitlab-ci/build-cts-runner.sh - -############### Build dEQP GL - -. .gitlab-ci/build-deqp-gl.sh - - -############### Uninstall the build software - -ccache --show-stats - -apt-get purge -y \ - bzip2 \ - ccache \ - cmake \ - g++ \ - gcc \ - git \ - libc6-dev \ - libgbm-dev \ - libgles2-mesa-dev \ - libpng-dev \ - libvulkan-dev \ - meson \ - pkg-config \ - python \ - python3-distutils \ - wget - -apt-get autoremove -y --purge |