diff options
author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-31 09:32:20 +0200 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-04-01 16:35:26 +0000 |
commit | b2ba88985690e76244d69ecf1eee81f543f149e3 (patch) | |
tree | a0faf17dd523510bc1b62fd00f1d59fffa290e09 /.gitlab-ci | |
parent | bd30a0bb8503c37934fea1901e019664a73fcbe2 (diff) |
ci: Remove INCLUDE_PIGLIT
It was enabled by all callers.
Also remove the unused $CI_FAIRY_PACKAGES and $VK_CTS_PACKAGES
references.
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9955>
Diffstat (limited to '.gitlab-ci')
-rw-r--r-- | .gitlab-ci/container/armhf_test.sh | 2 | ||||
-rw-r--r-- | .gitlab-ci/container/baremetal_build.sh | 2 | ||||
-rw-r--r-- | .gitlab-ci/container/create-rootfs.sh | 68 | ||||
-rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 9 | ||||
-rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 3 |
5 files changed, 34 insertions, 50 deletions
diff --git a/.gitlab-ci/container/armhf_test.sh b/.gitlab-ci/container/armhf_test.sh index bdb947e8597..da0cf9e2eb7 100644 --- a/.gitlab-ci/container/armhf_test.sh +++ b/.gitlab-ci/container/armhf_test.sh @@ -2,6 +2,4 @@ arch=armhf -INCLUDE_PIGLIT=1 - . .gitlab-ci/container/baremetal_build.sh diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index fe98e558f31..c44bf129423 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -5,8 +5,6 @@ set -o xtrace ROOTFS=/lava-files/rootfs-${arch} -INCLUDE_PIGLIT=1 - dpkg --add-architecture $arch apt-get update diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 779c28380c8..d3dd8d46570 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -17,58 +17,52 @@ elif [ $DEBIAN_ARCH = amd64 ]; then " fi -if [ -n "$INCLUDE_PIGLIT" ]; then - PIGLIT_PACKAGES="libpython3.7 - libwaffle-1-0 - libx11-6 - libx11-xcb1 - libxcb-glx0 - libxcb-shm0 - libxdamage1 - libxext6 - libxfixes3 - libxkbcommon0 - libxxf86vm1 - python3 - python3-lxml - python3-mako - python3-numpy - python3-packaging - python3-pil - python3-requests - python3-simplejson - python3-yaml - " - INSTALL_CI_FAIRY_PACKAGES="git - python3-dev - python3-pip - python3-setuptools - python3-wheel - " -fi +INSTALL_CI_FAIRY_PACKAGES="git + python3-dev + python3-pip + python3-setuptools + python3-wheel + " apt-get -y install --no-install-recommends \ $ARCH_PACKAGES \ - $CI_FAIRY_PACKAGES \ $INSTALL_CI_FAIRY_PACKAGES \ - $PIGLIT_PACKAGES \ - $VK_CTS_PACKAGES \ ca-certificates \ curl \ initramfs-tools \ libasan5 \ libexpat1 \ libpng16-16 \ + libpython3.7 \ libsensors5 \ libvulkan1 \ + libwaffle-1-0 \ + libx11-6 \ + libx11-xcb1 \ libxcb-dri2-0 \ libxcb-dri3-0 \ + libxcb-glx0 \ libxcb-present0 \ libxcb-randr0 \ + libxcb-shm0 \ libxcb-sync1 \ libxcb-xfixes0 \ + libxdamage1 \ + libxext6 \ + libxfixes3 \ + libxkbcommon0 \ libxshmfence1 \ + libxxf86vm1 \ netcat-openbsd \ + python3 \ + python3-lxml \ + python3-mako \ + python3-numpy \ + python3-packaging \ + python3-pil \ + python3-requests \ + python3-simplejson \ + python3-yaml \ sntp \ strace \ wget \ @@ -76,14 +70,12 @@ apt-get -y install --no-install-recommends \ xserver-xorg-core \ xz-utils -if [ -n "$INCLUDE_PIGLIT" ]; then - # Needed for ci-fairy, this revision is able to upload files to - # MinIO and doesn't depend on git - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb +# Needed for ci-fairy, this revision is able to upload files to +# MinIO and doesn't depend on git +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb - apt-get purge -y \ +apt-get purge -y \ $INSTALL_CI_FAIRY_PACKAGES -fi passwd root -d chsh -s /bin/sh diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index f3597f007a9..2c6365c3d5a 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -130,10 +130,8 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/. ############### Build piglit -if [ -n "$INCLUDE_PIGLIT" ]; then - . .gitlab-ci/container/build-piglit.sh - mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. -fi +. .gitlab-ci/container/build-piglit.sh +mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. ############### Build apitrace @@ -229,8 +227,7 @@ set -e cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/. cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/. -chroot /lava-files/rootfs-${DEBIAN_ARCH} \ - sh -c "INCLUDE_PIGLIT=$INCLUDE_PIGLIT sh /create-rootfs.sh" +chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh rm /lava-files/rootfs-${DEBIAN_ARCH}/llvm-snapshot.gpg.key diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 58c523967fd..87fa587cee2 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - MESA_LAVA_TAG: "2021-03-16-piglit-runner" + MESA_LAVA_TAG: "2021-03-31-piglit" .kernel+rootfs: stage: container-2 @@ -11,7 +11,6 @@ variables: KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz" UPLOAD_FOR_LAVA: 1 INSTALL_KERNEL_MODULES: 1 - INCLUDE_PIGLIT: 1 PIGLIT_BUILD_TARGETS: "piglit_replayer" script: - .gitlab-ci/container/lava_build.sh |