From 10728c2e6e6d96c077716e5cf222d6fc408319cd Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 9 Sep 2020 12:44:32 -0400 Subject: Correctly fix handling of CI Slack notifications. (#9902) --- tests/installer/slack.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/installer') diff --git a/tests/installer/slack.sh b/tests/installer/slack.sh index 83cb5fa7c4..3f3eff6e7e 100755 --- a/tests/installer/slack.sh +++ b/tests/installer/slack.sh @@ -1,6 +1,6 @@ # #No shebang necessary # BASH Lib: Simple incoming webhook for slack integration. -# +# # The script expects the following parameters to be defined by the upper layer: # SLACK_NOTIFY_WEBHOOK_URL # SLACK_BOT_NAME @@ -17,12 +17,12 @@ post_message() { case "$TYPE" in "PLAIN_MESSAGE") - curl -X POST --data-urlencode "payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"${SLACK_BOT_NAME}\", \"text\": \"${MESSAGE}\", \"icon_emoji\": \":space_invader:\"}" ${SLACK_NOTIFY_WEBHOOK_URL} + curl -X POST --data-urlencode "payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"${SLACK_BOT_NAME}\", \"text\": \"${MESSAGE}\", \"icon_emoji\": \":space_invader:\"}" "${SLACK_NOTIFY_WEBHOOK_URL}" ;; "TRAVIS_MESSAGE") - EVENT_LINE="${TRAVIS_JOB_NUMBER}: Event type '${TRAVIS_EVENT_TYPE}', on '${TRAVIS_OS_NAME}'" - if [ "$TRAVIS_EVENT_TYPE}" == "pull_request" ]; then - EVENT_LINE="${TRAVIS_JOB_NUMBER}: Event type '${TRAVIS_EVENT_TYPE}' #${TRAVIS_PULL_REQUEST}, on '${TRAVIS_OS_NAME}' " + if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ] || [ "${TRAVIS_BRANCH}" != "master" ] ; then + echo "Skipping notification due to build type." + return 0 fi if [ -n "${CUSTOM_CHANNEL}" ]; then -- cgit v1.2.3