From 61c07cc1d93da85daae300fac10442a58cd030a7 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Thu, 23 May 2024 23:11:39 -0700
Subject: [PATCH] ci/lava: enable Piglit OpenCL tests so we can test rusticl on
 the HW

THe CI job will follow in separate MR.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29370>
---
 .gitlab-ci/container/lava_build.sh | 14 +++++++++++++-
 .gitlab-ci/image-tags.yml          |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index aa90383e635..4858922bc0d 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -31,6 +31,7 @@ check_minio "${CI_PROJECT_PATH}"
 . .gitlab-ci/container/build-rust.sh
 
 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
+    BUILD_CL="ON"
     GCC_ARCH="aarch64-linux-gnu"
     KERNEL_ARCH="arm64"
     SKQP_ARCH="arm64"
@@ -52,6 +53,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     KERNEL_IMAGE_NAME="Image"
 
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
+    BUILD_CL="OFF"
     GCC_ARCH="arm-linux-gnueabihf"
     KERNEL_ARCH="arm"
     SKQP_ARCH="arm"
@@ -76,6 +78,7 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
       libxkbcommon-dev:armhf
     )
 else
+    BUILD_CL="ON"
     GCC_ARCH="x86_64-linux-gnu"
     KERNEL_ARCH="x86_64"
     SKQP_ARCH="x64"
@@ -147,6 +150,11 @@ CONTAINER_EPHEMERAL=(
     zstd
 )
 
+[ "$BUILD_CL" == "ON" ] && CONTAINER_EPHEMERAL+=(
+	ocl-icd-opencl-dev
+)
+
+
 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
 
 apt-get update
@@ -212,6 +220,10 @@ PKG_DEP=(
   firmware-misc-nonfree
 )
 
+[ "$BUILD_CL" == "ON" ] && PKG_ARCH+=(
+	ocl-icd-libopencl1
+)
+
 mmdebstrap \
     --variant=apt \
     --arch="${DEBIAN_ARCH}" \
@@ -306,7 +318,7 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 	     -DPIGLIT_BUILD_GLES1_TESTS=ON
 	     -DPIGLIT_BUILD_GLES2_TESTS=ON
 	     -DPIGLIT_BUILD_GLES3_TESTS=ON
-	     -DPIGLIT_BUILD_CL_TESTS=OFF
+	     -DPIGLIT_BUILD_CL_TESTS=$BUILD_CL
 	     -DPIGLIT_BUILD_VK_TESTS=ON
 	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
   . .gitlab-ci/container/build-piglit.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index c1011a76555..1436fab20bb 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -30,7 +30,7 @@ variables:
    DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
    DEBIAN_TEST_GL_TAG: "20240524-piglit-b"
    DEBIAN_TEST_VK_TAG: "20240524-piglit-b"
-   KERNEL_ROOTFS_TAG: "20240524-piglit-b"
+   KERNEL_ROOTFS_TAG: "20240524-piglit-c"
 
    ALPINE_X86_64_BUILD_TAG: "20240517-m0ld"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"