summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-07-24 11:01:49 -0400
committerChris Evich <cevich@redhat.com>2019-07-25 13:51:33 -0400
commitf55288c96f8a007a9fb2774c9f26d32f46da982a (patch)
treee35ea335c67c68bb3b80ee838896c9987a11848f /contrib
parentceb3d762980d56fb48fd9650df065e3211834805 (diff)
downloadpodman-f55288c96f8a007a9fb2774c9f26d32f46da982a.tar.gz
podman-f55288c96f8a007a9fb2774c9f26d32f46da982a.tar.bz2
podman-f55288c96f8a007a9fb2774c9f26d32f46da982a.zip
Cirrus: Simplify evil-unit check in image
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/check_image.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh
index 690a38119..2bdd240d9 100755
--- a/contrib/cirrus/check_image.sh
+++ b/contrib/cirrus/check_image.sh
@@ -36,10 +36,12 @@ do
"$(systemctl list-unit-files --no-legend $REQ_UNIT)" = "$REQ_UNIT enabled" || let "RET+=1"
done
-# Exits zero if any unit matching pattern is running
-UNIT_STATUS=$(systemctl is-active $EVIL_UNITS; echo $?)
-item_test "No interfering background units are active:" \
- "$UNIT_STATUS" -ne "0" || let "RET+=1"
+for evil_unit in $EVIL_UNITS
+do
+ # Exits zero if any unit matching pattern is running
+ unit_status=$(systemctl is-active $evil_unit &> /dev/null; echo $?)
+ item_test "No $evil_unit unit is present or active:" "$unit_status" -ne "0" || let "RET+=1"
+done
echo "Total failed tests: $RET"
exit $RET