Merge pull request #5421 from grondo/ci-system-fixes

ci: fix failure detection builds with coverage and remove obsolete system tests

etc/rc1

@@ -111,9 +111,7 @@ if test $RANK -eq 0 -a "${FLUX_SCHED_MODULE}" != "none" \
 fi
 
 if test $RANK -eq 0; then
-    method=$(flux config get --default=notset exec.method)
-    if test "${method}" != "systemd" \
-            -a -z "${FLUX_DISABLE_JOB_CLEANUP}"; then
+    if test -z "${FLUX_DISABLE_JOB_CLEANUP}"; then
 	flux admin cleanup-push <<-EOT
 	flux queue stop --quiet --all --nocheckpoint
 	flux cancel --user=all --quiet --states RUN

src/test/checks_run.sh

@@ -138,16 +138,17 @@ if test "$COVERAGE" = "t"; then
 
 	ARGS="$ARGS --enable-code-coverage"
 	CHECKCMDS="\
-	export ENABLE_USER_SITE=1; \
-	export COVERAGE_PROCESS_START=$(pwd)/coverage.rc; \
+	export ENABLE_USER_SITE=1 && \
+	export COVERAGE_PROCESS_START=$(pwd)/coverage.rc && \
 	${MAKE} -j $JOBS check-prep && \
 	(cd t && ${MAKE} -j $JOBS check ${SYSTEM:+TESTS=\"$SYSTEM_TESTS\"}) && \
 	${MAKE} code-coverage-capture &&
-	lcov -l flux*-coverage.info; \
-	rm -f coverage.xml; \
-	coverage combine .coverage*; \
-	coverage html; coverage xml; \
-	chmod 444 coverage.xml; \
+	lcov -l flux*-coverage.info && \
+	rm -f coverage.xml && \
+	coverage combine .coverage* && \
+	coverage html && \
+	coverage xml && \
+	chmod 444 coverage.xml && \
 	(coverage report || :)"
 
 # Use make install for T_INSTALL:

t/Makefile.am

@@ -317,8 +317,6 @@ EXTRA_DIST= \
 dist_check_SCRIPTS = \
 	$(TESTSCRIPTS) \
 	system/0001-basic.t \
-	system/0002-job-exec-sdexec-basic.t \
-	system/0003-instance-restart.t \
 	system/0004-recovery.t \
 	issues/t0441-kvs-put-get.sh \
 	issues/t0505-msg-handler-reg.lua \