diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-16 19:54:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 19:54:51 +0200 |
| commit | a449e9a2cf4b73163df75674059de04488cd2706 (patch) | |
| tree | 59b682bab11f3a1f4136c9678e3c91c80c6947ab /contrib | |
| parent | 386ffd28d64a19a9c244ab477a45c4d2fa239ff6 (diff) | |
| parent | 35c174f723da081af7cbc1016992cd6714cf6f24 (diff) | |
| download | podman-a449e9a2cf4b73163df75674059de04488cd2706.tar.gz podman-a449e9a2cf4b73163df75674059de04488cd2706.tar.bz2 podman-a449e9a2cf4b73163df75674059de04488cd2706.zip | |
Merge pull request #3546 from cevich/abstract_dest_branch
Cirrus: Abstract destination branch refs.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/notice_branch_failure.sh (renamed from contrib/cirrus/notice_master_failure.sh) | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index b2fcaa749..4acdb460a 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -45,6 +45,7 @@ fi # Defaults when not running under CI export CI="${CI:-false}" CIRRUS_CI="${CIRRUS_CI:-false}" +DEST_BRANCH="${DEST_BRANCH:-master}" CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}" CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-libpod} CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-unknown$(date +%s)} # difficult to reliably discover diff --git a/contrib/cirrus/notice_master_failure.sh b/contrib/cirrus/notice_branch_failure.sh index 1fc15cdf9..423231dfd 100755 --- a/contrib/cirrus/notice_master_failure.sh +++ b/contrib/cirrus/notice_branch_failure.sh @@ -9,10 +9,10 @@ ETX="$(echo -n -e '\x03')" RED="${ETX}4" NOR="$(echo -n -e '\x0f')" -if [[ "$CIRRUS_BRANCH" =~ "master" ]] +if [[ "$CIRRUS_BRANCH" = "$DEST_BRANCH" ]] then BURL="https://cirrus-ci.com/build/$CIRRUS_BUILD_ID" - ircmsg "${RED}[Action Recommended]: ${NOR}Post-merge testing ${RED}$CIRRUS_BRANCH failed${NOR} in $CIRRUS_TASK_NAME on $(OS_RELEASE_ID)-$(OS_RELEASE_VER): $BURL. Please investigate, and re-run if appropriate." + ircmsg "${RED}[Action Recommended]: ${NOR}Post-merge testing on ${RED}$CIRRUS_BRANCH failed${NOR} in $CIRRUS_TASK_NAME on $(OS_RELEASE_ID)-$(OS_RELEASE_VER): $BURL. Please investigate, and re-run if appropriate." fi # This script assumed to be executed on failure |