Mesa (master): ci/bare-metal: build full piglit for baremetal ARM targets.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 12647ac193a040ecbb63401b0ef4af2d814483b9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12647ac193a040ecbb63401b0ef4af2d814483b9

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Sat Oct 17 21:34:42 2020 +0200

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 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7370>

---

 .gitlab-ci.yml                          | 4 ++--
 .gitlab-ci/bare-metal/fastboot.sh       | 1 +
 .gitlab-ci/container/arm64_test.sh      | 3 ---
 .gitlab-ci/container/armhf_test.sh      | 2 ++
 .gitlab-ci/container/baremetal_build.sh | 3 +++
 .gitlab-ci/container/lava_build.sh      | 2 +-
 .gitlab-ci/create-rootfs.sh             | 8 ++++++++
 .gitlab-ci/lava-gitlab-ci.yml           | 2 +-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b34bebad6a5..25efa77a8d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 18fb320ee27..a9c0114584a 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -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
diff --git a/.gitlab-ci/container/arm64_test.sh b/.gitlab-ci/container/arm64_test.sh
index 18f4e674d79..98e3b4ab0b0 100644
--- a/.gitlab-ci/container/arm64_test.sh
+++ b/.gitlab-ci/container/arm64_test.sh
@@ -2,7 +2,4 @@
 
 arch=arm64
 
-INCLUDE_PIGLIT=1
-PIGLIT_BUILD_TARGETS="piglit_replayer"
-
 . .gitlab-ci/container/baremetal_build.sh
diff --git a/.gitlab-ci/container/armhf_test.sh b/.gitlab-ci/container/armhf_test.sh
index da0cf9e2eb7..bdb947e8597 100644
--- a/.gitlab-ci/container/armhf_test.sh
+++ b/.gitlab-ci/container/armhf_test.sh
@@ -2,4 +2,6 @@
 
 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 b477b51cca0..dde92d5bf99 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -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 \
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 693cb924808..ae09a7d546a 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -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
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 109b691012d..17c25d4e812 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -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 \
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 84a1183fc6d..24e2f59ba6b 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-12-23-opengl-2"
+  DISTRIBUTION_TAG: "2020-12-23-piglit"
 
 .kernel+rootfs:
   stage: container-2