diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /scripts/slack | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'scripts/slack')
-rwxr-xr-x | scripts/slack | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/slack b/scripts/slack index 60bc70a8542..293f8070504 100755 --- a/scripts/slack +++ b/scripts/slack @@ -1,6 +1,5 @@ #!/bin/bash -# This is copied from: -# https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/bin/slack +# This is based on https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/bin/slack # # Sends Slack notification MSG to CI_SLACK_WEBHOOK_URL (which needs to be set). # ICON_EMOJI needs to be set to an icon emoji name (without the `:` around it). @@ -8,10 +7,11 @@ CHANNEL=$1 MSG=$2 ICON_EMOJI=$3 +USERNAME=$4 -if [ -z "$CHANNEL" ] || [ -z "$CI_SLACK_WEBHOOK_URL" ] || [ -z "$MSG" ] || [ -z "$ICON_EMOJI" ]; then - echo "Missing argument(s) - Use: $0 channel message icon_emoji" +if [ -z "$CHANNEL" ] || [ -z "$CI_SLACK_WEBHOOK_URL" ] || [ -z "$MSG" ] || [ -z "$ICON_EMOJI" ] || [ -z "$USERNAME" ]; then + echo "Missing argument(s) - Use: $0 channel message icon_emoji username" echo "and set CI_SLACK_WEBHOOK_URL environment variable." else - curl -X POST --data-urlencode 'payload={"channel": "#'"$CHANNEL"'", "username": "GitLab QA Bot", "text": "'"$MSG"'", "icon_emoji": "'":$ICON_EMOJI:"'"}' "$CI_SLACK_WEBHOOK_URL" + curl -X POST --data-urlencode 'payload={"channel": "#'"$CHANNEL"'", "username": "'"$USERNAME"'", "text": "'"$MSG"'", "icon_emoji": "'":$ICON_EMOJI:"'"}' "$CI_SLACK_WEBHOOK_URL" fi |