summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2022-04-26 11:04:53 -0400
committerChris Evich <cevich@redhat.com>2022-04-26 11:04:53 -0400
commit1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1 (patch)
treef9c07c7e1270bb0d9aafe413ac9420497dcca30e /contrib/cirrus
parente7edf30a1b4b2c78a24c593c30ef393e053b4e2f (diff)
downloadpodman-1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1.tar.gz
podman-1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1.tar.bz2
podman-1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1.zip
Cirrus: Fix skipping all/most tests
The originally intent for skipping tests based on change-content was to optimize the PR workflow. However, a mistake in a conditional is causing almost all tasks running for Cron and branches to be skipped. Fix this by checking for an empty '$CIRRUS_PR' variable. This value is always empty when operating outside of PRs. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/runner.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index aee9bcfbb..5d6ba9921 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -373,8 +373,9 @@ dotest() {
function _bail_if_test_can_be_skipped() {
local head base diffs
- # Cirrus sets these for PRs but not cron. In cron, we never want to skip.
- for v in CIRRUS_CHANGE_IN_REPO DEST_BRANCH; do
+ # Cirrus sets these for PRs but not branches or cron. In cron and branches,
+ #we never want to skip.
+ for v in CIRRUS_CHANGE_IN_REPO CIRRUS_PR; do
if [[ -z "${!v}" ]]; then
msg "[ _cannot do selective skip: \$$v is undefined ]"
return 0