From 83be519fc279d30e7b0a89160c411c6a85f0be0d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 6 Sep 2024 14:21:06 +1000
Subject: [PATCH] CI: retry valgrind jobs if they fail

Our valgrind jobs are very timing-sensitive so it's very common that
they fail with an error when the reason is just valgrind being slower
and we miss a deadline somewhere.

Retry them if they fail, hopefully that gives us more reliable
pipelines.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1040>
---
 .gitlab-ci.yml         | 18 ++++++++++++++++++
 .gitlab-ci/ci.template |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0373f7ad..466c0a30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -667,6 +667,8 @@ vm-valgrind-touchpad:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-tap:
   stage: valgrind
@@ -675,6 +677,8 @@ vm-valgrind-tap:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-touchpad-buttons:
   stage: valgrind
@@ -683,6 +687,8 @@ vm-valgrind-touchpad-buttons:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-tablet:
   stage: valgrind
@@ -691,6 +697,8 @@ vm-valgrind-tablet:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-gestures-device:
   stage: valgrind
@@ -699,6 +707,8 @@ vm-valgrind-gestures-device:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-backends:
   stage: valgrind
@@ -707,6 +717,8 @@ vm-valgrind-backends:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-misc:
   stage: valgrind
@@ -715,6 +727,8 @@ vm-valgrind-misc:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-other devices:
   stage: valgrind
@@ -723,6 +737,8 @@ vm-valgrind-other devices:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 vm-valgrind-pointer:
   stage: valgrind
@@ -731,6 +747,8 @@ vm-valgrind-pointer:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 
 .fedora-build@template:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 3f45e864..f51e6f64 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -445,6 +445,8 @@ vm-valgrind-{{suite.name}}:
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
     LITEST_JOBS: 4
+  retry:
+    max: 2
 
 {% endfor %}
 {% endfor %}{# for if distro.use_for_qemu_tests #}