From: Maria Matejka <mq@ucw.cz>
Date: Tue, 12 May 2026 21:02:04 +0000 (+0200)
Subject: CI: Automatically retry failed unit test with verbose option
X-Git-Tag: v2.19.0~23
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=05c92e66985b4f3fd80ea36feb6586a25a85b075;p=thirdparty%2Fbird.git

CI: Automatically retry failed unit test with verbose option

To spare time, we want to get more data immediately from failed tests.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 225193712..eef8a1f67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -874,7 +874,7 @@ docker-ubuntu-25.10-amd64:
     - MAKE=make
     - which gmake 2>/dev/null >/dev/null && MAKE=gmake
     - $MAKE VERBOSE=1
-    - $MAKE VERBOSE=1 check
+    - $MAKE VERBOSE=1 TEST_RETRY_VERBOSE=1 check
     # Build docs when tools are available
     - if which linuxdoc pdflatex sgmlsasp >/dev/null ; then $MAKE docs ; fi
     # Check that the reported version is the right one
diff --git a/Makefile.in b/Makefile.in
index 2dbf96611..52d5d1593 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -181,7 +181,7 @@ $(tests_targets): %: %.o $(tests_objs) | prepare
 $(tests_targets): LIBS += $(DAEMON_LIBS)
 
 $(tests_targets_ok): %.ok: %
-	$(Q)$(if $(CROSSBUILD_ARCH),qemu-$(CROSSBUILD_ARCH) )$* 2>/dev/null && touch $*.ok
+	$(Q)$(if $(CROSSBUILD_ARCH),qemu-$(CROSSBUILD_ARCH) )$* 2>/dev/null && touch $*.ok $(if $(TEST_RETRY_VERBOSE), || ($(if $(CROSSBUILD_ARCH),qemu-$(CROSSBUILD_ARCH) )$* -ftv && false))
 
 test: testsclean check
 check: tests tests_run
diff --git a/gitlab/template.yml.j2 b/gitlab/template.yml.j2
index dfd1b9067..37048cf78 100644
--- a/gitlab/template.yml.j2
+++ b/gitlab/template.yml.j2
@@ -339,7 +339,7 @@ docker-{{ docker["name"] }}:
     - MAKE=make
     - which gmake 2>/dev/null >/dev/null && MAKE=gmake
     - $MAKE VERBOSE=1
-    - $MAKE VERBOSE=1 check
+    - $MAKE VERBOSE=1 TEST_RETRY_VERBOSE=1 check
     # Build docs when tools are available
     - if which linuxdoc pdflatex sgmlsasp >/dev/null ; then $MAKE docs ; fi
     # Check that the reported version is the right one