aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-05-09 07:40:12 -0600
committerEd Santiago <santiago@redhat.com>2022-05-09 13:14:25 -0600
commitc4865767171b847a85c441ded623588d26d1588b (patch)
treedb9440f232fc9e0cb3d082fbb65c8145ab8246e8
parent68e45555b3dfc9662ce71b6ff548b43c9ea8d50c (diff)
downloadpodman-c4865767171b847a85c441ded623588d26d1588b.tar.gz
podman-c4865767171b847a85c441ded623588d26d1588b.tar.bz2
podman-c4865767171b847a85c441ded623588d26d1588b.zip
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>
-rw-r--r--contrib/cirrus/lib.sh1
-rwxr-xr-xcontrib/cirrus/runner.sh2
2 files changed, 1 insertions, 2 deletions
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