ci/bare-metal: build full piglit for baremetal ARM targets.

ARM64 had it for traces only, upgrade it to a full build so we can test
a630.  We also add it for armhf, as we'll want it on both rpi and etnaviv.

Bumped the LAVA tag as well, since the script changes a bit and it does
impact the final image (even if we aren't pulling in full piglit there
yet).  Note I also had to drop the "v" on the tarring of their rootfs, as
the verbosity on baremetal was exceeding job log size.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7370>
This commit is contained in:
Christian Gmeiner 2020-10-17 21:34:42 +02:00 committed by Marge Bot
parent 886a555e80
commit 12647ac193
8 changed files with 18 additions and 7 deletions

View File

@ -408,7 +408,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &arm64_test "2020-12-22-runner"
MESA_IMAGE_TAG: &arm64_test "2020-12-23-piglit-2"
.use-arm64_test:
variables:
@ -422,7 +422,7 @@ armhf_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &armhf_test "2020-12-22-runner"
MESA_IMAGE_TAG: &armhf_test "2020-12-23-piglit-2"
.use-armhf_test:
variables:

View File

@ -68,6 +68,7 @@ pushd rootfs
find -H | \
egrep -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
egrep -v "traces-db|apitrace|renderdoc|python" | \
egrep -v "piglit" | \
cpio -H newc -o | \
xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
popd

View File

@ -2,7 +2,4 @@
arch=arm64
INCLUDE_PIGLIT=1
PIGLIT_BUILD_TARGETS="piglit_replayer"
. .gitlab-ci/container/baremetal_build.sh

View File

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

View File

@ -5,6 +5,8 @@ set -o xtrace
ROOTFS=/lava-files/rootfs-${arch}
INCLUDE_PIGLIT=1
dpkg --add-architecture $arch
apt-get update
@ -28,6 +30,7 @@ BAREMETAL_EPHEMERAL=" \
libpython3-dev:$arch \
libstdc++6:$arch \
libtinfo-dev:$arch \
libudev-dev:$arch \
libvulkan-dev:$arch \
libwaffle-dev:$arch \
libxcb-keysyms1-dev:$arch \

View File

@ -243,7 +243,7 @@ rm -rf /libdrm
du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
pushd /lava-files/rootfs-${DEBIAN_ARCH}
tar cvzf /lava-files/lava-rootfs.tgz .
tar czf /lava-files/lava-rootfs.tgz .
popd
if [ ${DEBIAN_ARCH} = arm64 ]; then

View File

@ -50,15 +50,23 @@ apt-get -y install --no-install-recommends \
libpng16-16 \
libpython3.7 \
libsensors5 \
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-pil \

View File

@ -1,5 +1,5 @@
variables:
DISTRIBUTION_TAG: "2020-12-23-opengl-2"
DISTRIBUTION_TAG: "2020-12-23-piglit"
.kernel+rootfs:
stage: container-2