From c4865767171b847a85c441ded623588d26d1588b Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 9 May 2022 07:40:12 -0600
Subject: test skipper: check for $DEST_BRANCH
The test-skipping optimization is failing as rootless on non-main,
because $DEST_BRANCH is not set. Solution: check for envariable,
skip test if missing. (This was part of my original PR, but was
accidentally removed in #14013)
Also: DEST_BRANCH was silently being defaulted to 'main' in lib.sh.
Remove that: per @cevich, it is no longer necessary.
Fixes: #14131
Signed-off-by: Ed Santiago <santiago@redhat.com>
---
contrib/cirrus/lib.sh | 1 -
contrib/cirrus/runner.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
(limited to 'contrib/cirrus')
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 0f02c166f..46b245a45 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -74,7 +74,6 @@ PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/server.log
# Defaults when not running under CI
export CI="${CI:-false}"
CIRRUS_CI="${CIRRUS_CI:-false}"
-DEST_BRANCH="${DEST_BRANCH:-main}"
CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}"
CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-podman}
# Cirrus only sets $CIRRUS_BASE_SHA properly for PRs, but $EPOCH_TEST_COMMIT
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 101270703..c4a714691 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -375,7 +375,7 @@ function _bail_if_test_can_be_skipped() {
# 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
+ for v in CIRRUS_CHANGE_IN_REPO CIRRUS_PR DEST_BRANCH; do
if [[ -z "${!v}" ]]; then
msg "[ _cannot do selective skip: \$$v is undefined ]"
return 0
--
cgit v1.2.3-54-g00ecf