diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-09 20:29:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 20:29:20 -0400 |
| commit | 21c816bb169912bc98e77735ba7bece103c0d799 (patch) | |
| tree | db9440f232fc9e0cb3d082fbb65c8145ab8246e8 | |
| parent | 68e45555b3dfc9662ce71b6ff548b43c9ea8d50c (diff) | |
| parent | c4865767171b847a85c441ded623588d26d1588b (diff) | |
| download | podman-21c816bb169912bc98e77735ba7bece103c0d799.tar.gz podman-21c816bb169912bc98e77735ba7bece103c0d799.tar.bz2 podman-21c816bb169912bc98e77735ba7bece103c0d799.zip | |
Merge pull request #14158 from edsantiago/test_skip_fix_main
test skipper: check for $DEST_BRANCH
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 2 |
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 |