summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-26 13:41:47 -0400
committerGitHub <noreply@github.com>2022-04-26 13:41:47 -0400
commitd504c3cf85852bdda57c819df0df1d99db59bc19 (patch)
tree86fdbb33b57f3dcf034ba7d9a31836ad860fbe9e
parentfc3a48232faf21b9a6450c403b814fec182d1ed3 (diff)
parent1a9f110b5976fea55e8a33ffa6d8530cd3ee3fc1 (diff)
downloadpodman-d504c3cf85852bdda57c819df0df1d99db59bc19.tar.gz
podman-d504c3cf85852bdda57c819df0df1d99db59bc19.tar.bz2
podman-d504c3cf85852bdda57c819df0df1d99db59bc19.zip
Merge pull request #14013 from cevich/fix_main_archive
Cirrus: Fix skipping all/most tests
-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