Merge pull request #14013 from cevich/fix_main_archive

Cirrus: Fix skipping all/most tests
containers · Apr 26, 2022 · d504c3c · d504c3c
2 parents fc3a482 + 1a9f110
commit d504c3c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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