diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | tests/installer/slack.sh | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 48999dec78..45c791e170 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,6 @@ notifications: webhooks: urls: - https://app.fossa.io/hooks/travisci - if: branch = master - slack: - if: branch = master # Define the stage sequence and conditionals # 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 |