diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 09:06:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 09:06:39 +0300 |
| commit | 90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (patch) | |
| tree | 06156e751d516e3d43d3981bdd6c41784a7acc71 /scripts | |
| parent | 8c7eab92cd0009f55cb999bbade43e0f969c137e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/notify-slack | 14 | ||||
| -rwxr-xr-x | scripts/review_apps/automated_cleanup.rb | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/scripts/notify-slack b/scripts/notify-slack deleted file mode 100755 index 5907fd8b986..00000000000 --- a/scripts/notify-slack +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# 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). - -CHANNEL=$1 -MSG=$2 -ICON_EMOJI=$3 - -if [ -z "$CHANNEL" ] || [ -z "$CI_SLACK_WEBHOOK_URL" ] || [ -z "$MSG" ] || [ -z "$ICON_EMOJI" ]; then - echo "Missing argument(s) - Use: $0 channel message icon_emoji" - 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" -fi diff --git a/scripts/review_apps/automated_cleanup.rb b/scripts/review_apps/automated_cleanup.rb index 9edc1a2b857..65d03f50422 100755 --- a/scripts/review_apps/automated_cleanup.rb +++ b/scripts/review_apps/automated_cleanup.rb @@ -62,7 +62,7 @@ class AutomatedCleanup gitlab.deployments(project_path, per_page: DEPLOYMENTS_PER_PAGE).auto_paginate do |deployment| environment = deployment.environment - next unless environment.name.start_with?('review/') + next unless !environment.nil? && environment.name.start_with?('review/') next if checked_environments.include?(environment.slug) last_deploy = deployment.created_at |