summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2021-03-24 10:16:26 -0700
committerMarge Bot <eric+marge@anholt.net>2021-04-02 18:42:04 +0000
commitdee89af505d505827a1ad4b08d3bfad3659a000e (patch)
treed73c1fc79a60b03c8be6af2a30a6d8adcb8c093c /.gitlab-ci
parent1b35cc29dd2e29f8072f4079d678f1d722bdd48e (diff)
ci: Uprev piglit to 6a4be9e9946d ("piglit: NOTE! Default branch is now main")
Along with other new tests, brings in the perf improvement for gl-1.3-texture-env so we can stop skipping it. Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9806>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/build-piglit.sh2
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 904428c00be..97a33de2e34 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -8,7 +8,7 @@ fi
git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
pushd /piglit
-git checkout b0bbeb876a506e0ee689dd7e17cee374c8284058
+git checkout 6a4be9e9946df310d9402f995f371c7deb8c27ba
patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
ninja $PIGLIT_BUILD_TARGETS
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index eda64950a92..44ba8cb42d8 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
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"
INSTALL_KERNEL_MODULES: 1
- MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-deqp-runner"
+ MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-piglit"
MINIO_SUFFIX: "lava"
PIGLIT_BUILD_TARGETS: "piglit_replayer"