make remotesystem: fail early if serial tests fail

Exit status was being lost due to sequential bats invocations. Solution: preserve exit status of first (serial) run, and skip parallel tests if those fail. I am so, so sorry. Signed-off-by: Eduardo Santiago <[email protected]>
containers · Nov 27, 2024 · 2f1a1fb · 2f1a1fb
1 parent ceee7cb
commit 2f1a1fb
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -737,8 +737,11 @@ remotesystem:
 			exit 1;\
 		fi;\
 		env PODMAN="$(CURDIR)/bin/podman-remote" bats -T --filter-tags '!ci:parallel' test/system/ ;\
-		env PODMAN="$(CURDIR)/bin/podman-remote" bats -T --filter-tags ci:parallel -j $$(nproc) test/system/ ;\
-		rc=$$?;\
+		rc=$$?; \
+		if [ $$rc -eq 0 ]; then \
+		   env PODMAN="$(CURDIR)/bin/podman-remote" bats -T --filter-tags ci:parallel -j $$(nproc) test/system/ ;\
+		   rc=$$?;\
+		fi; \
 		kill %1;\
 	else \
 		echo "Skipping $@: 'timeout -v' unavailable'";\