ci/llvmpipe: Switch rusticl and clover testing over to deqp-runner.

The usual reasons: Flake handling, familiar skips/xfails handling, faster
parallelization.  This also sets us up for running a subset of the CL CTS
once we decide to build it in our containers.

Acked-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19608>

3 files changed, 5 insertions, 79 deletions

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index b272a94a061..ccd71c9f2d2 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -18,6 +18,7 @@ INSTALL=`pwd`/install
 export LD_LIBRARY_PATH=`pwd`/install/lib/
 export EGL_PLATFORM=surfaceless
 export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json
+export OCL_ICD_VENDORS=`pwd`/install/etc/OpenCL/vendors/
 
 RESULTS=`pwd`/${DEQP_RESULTS_DIR:-results}
 mkdir -p $RESULTS
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index cf7e2b3bed9..244dcd6b8ab 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,6 +1,6 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-11-08-skqp-runner"
+   DEBIAN_BASE_TAG: "2022-11-08-deqp-runner"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
    DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3"
@@ -11,11 +11,11 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-11-08-skqp-runner"
-   DEBIAN_X86_TEST_VK_TAG: "2022-11-08-skqp-runner"
+   DEBIAN_X86_TEST_GL_TAG: "2022-11-08-deqp-runner"
+   DEBIAN_X86_TEST_VK_TAG: "2022-11-08-deqp-runner"
 
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
-   KERNEL_ROOTFS_TAG: "2022-11-08-skqp-runner"
+   KERNEL_ROOTFS_TAG: "2022-11-08-deqp-runner"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
diff --git a/.gitlab-ci/piglit/run_cl.sh b/.gitlab-ci/piglit/run_cl.sh
deleted file mode 100755
index c58c70a76b2..00000000000
--- a/.gitlab-ci/piglit/run_cl.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-VERSION=`head -1 install/VERSION`
-ROOTDIR=`pwd`
-
-if [ -d results ]; then
-    cd results && rm -rf ..?* .[!.]* *
-fi
-cd /piglit
-
-export OCL_ICD_VENDORS=$ROOTDIR/install/etc/OpenCL/vendors/
-
-set +e
-unset DISPLAY
-export LD_LIBRARY_PATH=$ROOTDIR/install/lib
-clinfo
-
-# If the job is parallel at the gitlab job level, will take the corresponding
-# fraction of the caselist.
-if [ -n "$CI_NODE_INDEX" ]; then
-
-    if [ "$PIGLIT_PROFILES" != "${PIGLIT_PROFILES% *}" ]; then
-        echo "Can't parallelize piglit with multiple profiles"
-        exit 1
-    fi
-    USE_CASELIST=1
-fi
-
-if [ -n "$USE_CASELIST" ]; then
-    ./piglit print-cmd $PIGLIT_TESTS $PIGLIT_PROFILES --format "{name}" > /tmp/case-list.txt
-
-    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
-
-    PIGLIT_TESTS="--test-list /tmp/case-list.txt"
-fi
-
-./piglit run -c -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_TESTS $PIGLIT_PROFILES $ROOTDIR/results
-retVal=$?
-if [ $retVal -ne 0 ]; then
-    echo "Found $(cat /tmp/version.txt), expected $VERSION"
-fi
-set -e
-
-PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES}
-mkdir -p .gitlab-ci/piglit
-./piglit summary console $ROOTDIR/results \
-  | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
-  | head -n -1 \
-  | grep -v ": pass" \
-  | sed '/^summary:/Q' \
-  > .gitlab-ci/piglit/$PIGLIT_RESULTS.txt
-
-if [ -n "$USE_CASELIST" ]; then
-    # Just filter the expected results based on the tests that were actually
-    # executed, and switch to the version with no summary
-    cat .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig | sed '/^summary:/Q' | rev \
-         | cut -f2- -d: | rev | sed "s/$/:/g" > /tmp/executed.txt
-    grep -F -f /tmp/executed.txt $ROOTDIR/install/$PIGLIT_RESULTS.txt \
-         > .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline || true
-else
-    cp $ROOTDIR/install/$PIGLIT_RESULTS.txt .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline
-fi
-
-if diff -q .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}; then
-    exit 0
-fi
-
-./piglit summary html --exclude-details=pass $ROOTDIR/results/summary $ROOTDIR/results
-
-echo Unexpected change in results:
-diff -u .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}
-exit 1