From 2e2a17356715884e49877fb7d7808bdb4041900e Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Sat, 16 Mar 2019 12:14:43 -0400 Subject: Cirrus: Fix post-merge failure notice Likely caused by rebase typos after removing test-commit. This fixes notifications to actually get sent. Also show env. vars after setting up the environment - helps debugging. Signed-off-by: Chris Evich --- contrib/cirrus/notice_master_failure.sh | 3 +-- contrib/cirrus/setup_environment.sh | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib') 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" -- cgit v1.2.3-54-g00ecf