fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Remove INCLUDE_PIGLIT

Browse source 
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>
This commit is contained in:
Michel Dänzer 2021-03-31 09:32:20 +02:00 • committed by Marge Bot
parent bd30a0bb85
commit b2ba889856
6 changed files with 36 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -461,7 +461,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &arm64_test "2021-03-17-waffle-dep"
MESA_IMAGE_TAG: &arm64_test "2021-03-31-piglit"
.use-arm64_test:
extends:
@ -478,7 +478,7 @@ armhf_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &armhf_test "2021-03-17-waffle-dep"
MESA_IMAGE_TAG: &armhf_test "2021-03-31-piglit"
.use-armhf_test:
extends:

2
.gitlab-ci/container/armhf_test.sh
View file

@ -2,6 +2,4 @@
arch=armhf
INCLUDE_PIGLIT=1
. .gitlab-ci/container/baremetal_build.sh

2
.gitlab-ci/container/baremetal_build.sh
View file

@ -5,8 +5,6 @@ set -o xtrace
ROOTFS=/lava-files/rootfs-${arch}
INCLUDE_PIGLIT=1
dpkg --add-architecture $arch
apt-get update

68
.gitlab-ci/container/create-rootfs.sh
View file

@ -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

9
.gitlab-ci/container/lava_build.sh
View file

@ -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

3
.gitlab-ci/lava-gitlab-ci.yml
View file

@ -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