diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index d7420e43c095eab15320f08ed938834f021a9e21..5cf7e758c7462a320ea52ca81e5c4d3e2cb74fcb 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -21,7 +21,7 @@ notify-update-gitaly: script: - echo "NOTIFY_CHANNEL is ${NOTIFY_CHANNEL}" - echo "CI_PIPELINE_URL is ${CI_PIPELINE_URL}" - - scripts/slack ${NOTIFY_CHANNEL} "â˜ ï¸ \`${GITALY_UPDATE_BRANCH}\` failed! â˜ ï¸ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing + - scripts/slack ${NOTIFY_CHANNEL} "â˜ ï¸ \`${GITALY_UPDATE_BRANCH}\` failed! â˜ ï¸ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing "GitLab QA Bot" notify-security-pipeline: extends: diff --git a/scripts/slack b/scripts/slack index dea0e86799e623b9c2c8954d386fb273b35624a0..293f8070504074b37be98ccc30e4284df58f9170 100755 --- a/scripts/slack +++ b/scripts/slack @@ -7,10 +7,10 @@ CHANNEL=$1 MSG=$2 ICON_EMOJI=$3 -USERNAME=${4:-"GitLab QA Bot"} +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 [username]" +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": "'"$USERNAME"'", "text": "'"$MSG"'", "icon_emoji": "'":$ICON_EMOJI:"'"}' "$CI_SLACK_WEBHOOK_URL"