aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-16 12:59:32 -0700
committerGitHub <noreply@github.com>2019-03-16 12:59:32 -0700
commit7f9fdbeafeee8616f4f40a79c1b2dfd177dbe962 (patch)
treed139beccd074cf61609ce73382a495aec92a04be
parent4b771162ce7342cbaed2235ccd2a2908e7163793 (diff)
parent2e2a17356715884e49877fb7d7808bdb4041900e (diff)
downloadpodman-7f9fdbeafeee8616f4f40a79c1b2dfd177dbe962.tar.gz
podman-7f9fdbeafeee8616f4f40a79c1b2dfd177dbe962.tar.bz2
podman-7f9fdbeafeee8616f4f40a79c1b2dfd177dbe962.zip
Merge pull request #2676 from cevich/fix_fail_irc
Cirrus: Fix post-merge failure notice
-rwxr-xr-xcontrib/cirrus/notice_master_failure.sh3
-rwxr-xr-xcontrib/cirrus/setup_environment.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/notice_master_failure.sh b/contrib/cirrus/notice_master_failure.sh
index e18460a54..4b09331d3 100755
--- a/contrib/cirrus/notice_master_failure.sh
+++ b/contrib/cirrus/notice_master_failure.sh
@@ -12,8 +12,7 @@ NOR="$(echo -n -e '\x0f')"
if [[ "$CIRRUS_BRANCH" =~ "master" ]]
then
BURL="https://cirrus-ci.com/build/$CIRRUS_BUILD_ID"
- echo "Monitoring execution of $CIRRUS_TASK_NAME and notifying on failure"
- MSG="${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 ${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
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index ead2f7343..618027ecd 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -89,4 +89,6 @@ then
fi
fi
+show_env_vars
+
record_timestamp "env. setup end"