diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-17 15:17:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 15:17:14 +0200 |
| commit | 1cb638c1bc5506283ea585b6826df7bb48a78b1a (patch) | |
| tree | 8f2cbaa6b20c4dea9495ec6b7de79088179d68b8 /contrib | |
| parent | cedbbfa543651a13055a1fe093a4d0a2a28ccdfd (diff) | |
| parent | 4fe115094ccffad29d614024b9156f19907e682e (diff) | |
| download | podman-1cb638c1bc5506283ea585b6826df7bb48a78b1a.tar.gz podman-1cb638c1bc5506283ea585b6826df7bb48a78b1a.tar.bz2 podman-1cb638c1bc5506283ea585b6826df7bb48a78b1a.zip | |
Merge pull request #14157 from edsantiago/test_skip_fix
[v4.1] test skipper: check for $DEST_BRANCH
Diffstat (limited to 'contrib')
| -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 5d58042a5..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:-v4.1}" 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 |