diff options
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/notifications.gitlab-ci.yml | 29 | ||||
-rw-r--r-- | doc/development/pipelines.md | 6 | ||||
-rw-r--r-- | locale/gitlab.pot | 3 | ||||
-rw-r--r-- | qa/qa/page/project/issue/show.rb | 10 | ||||
-rwxr-xr-x | scripts/notify-slack | 14 | ||||
-rwxr-xr-x | scripts/review_apps/automated_cleanup.rb | 2 |
7 files changed, 13 insertions, 53 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 630c82bcc5c..c1a9d38d5aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ stages: - review - qa - post-test - - notification - pages variables: @@ -33,7 +32,6 @@ include: - local: .gitlab/ci/frontend.gitlab-ci.yml - local: .gitlab/ci/global.gitlab-ci.yml - local: .gitlab/ci/memory.gitlab-ci.yml - - local: .gitlab/ci/notifications.gitlab-ci.yml - local: .gitlab/ci/pages.gitlab-ci.yml - local: .gitlab/ci/qa.gitlab-ci.yml - local: .gitlab/ci/reports.gitlab-ci.yml diff --git a/.gitlab/ci/notifications.gitlab-ci.yml b/.gitlab/ci/notifications.gitlab-ci.yml deleted file mode 100644 index 8e00ba022d0..00000000000 --- a/.gitlab/ci/notifications.gitlab-ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -.notify: - image: alpine - stage: notification - dependencies: [] - cache: {} - before_script: - - apk update && apk add git curl bash - -schedule:package-and-qa:notify-success: - extends: - - .only-canonical-schedules - - .notify - variables: - COMMIT_NOTES_URL: "https://$CI_SERVER_HOST/$CI_PROJECT_PATH/commit/$CI_COMMIT_SHA#notes-list" - script: - - 'scripts/notify-slack qa-master ":tada: Scheduled QA against master passed! :tada: See $CI_PIPELINE_URL. For downstream pipelines, see $COMMIT_NOTES_URL" ci_passing' - needs: ["schedule:package-and-qa"] - when: on_success - -schedule:package-and-qa:notify-failure: - extends: - - .only-canonical-schedules - - .notify - variables: - COMMIT_NOTES_URL: "https://$CI_SERVER_HOST/$CI_PROJECT_PATH/commit/$CI_COMMIT_SHA#notes-list" - script: - - 'scripts/notify-slack qa-master ":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See $CI_PIPELINE_URL. For downstream pipelines, see $COMMIT_NOTES_URL" ci_failing' - needs: ["schedule:package-and-qa"] - when: on_failure diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index 5954de03db4..cd23ab9226f 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -27,7 +27,6 @@ The current stages are: - `review`: This stage includes jobs that deploy the GitLab and Docs Review Apps. - `qa`: This stage includes jobs that perform QA tasks against the Review App that is deployed in the previous stage. -- `notification`: This stage includes jobs that sends notifications about pipeline status. - `post-test`: This stage includes jobs that build reports or gather data from the previous stages' jobs (e.g. coverage, Knapsack metadata etc.). - `pages`: This stage includes a job that deploys the various reports as @@ -203,11 +202,6 @@ subgraph "`qa` stage" dast -.-> |needs and depends on| G; end -subgraph "`notification` stage" - NOTIFICATION1["schedule:package-and-qa:notify-success<br>(on_success)"] -.-> |needs| P; - NOTIFICATION2["schedule:package-and-qa:notify-failure<br>(on_failure)"] -.-> |needs| P; - end - subgraph "`post-test` stage" M end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d08b0d17b17..1e5aba37310 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -18181,6 +18181,9 @@ msgstr "" msgid "UserOnboardingTour|Take a look. Here's a nifty menu for quickly creating issues, merge requests, snippets, projects and groups. Click on it and select \"New project\" from the \"GitLab\" section to get started." msgstr "" +msgid "UserOnboardingTour|Thanks for taking the guided tour. Remember, if you want to go through it again, you can start %{emphasisStart}Learn GitLab%{emphasisEnd} in the help menu on the top right." +msgstr "" + msgid "UserOnboardingTour|Thanks for the feedback! %{thumbsUp}" msgstr "" diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index d2732eb7dd2..8f5632f7e6e 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -161,7 +161,15 @@ module QA def select_user(username) find("#{element_selector_css(:assignee_block)} input").set(username) - find('.dropdown-menu-user-link', text: "@#{username}").click + + dropdown_menu_user_link_selector = '.dropdown-menu-user-link' + at_username = "@#{username}" + ten_seconds = 10 + + wait(reload: false, max: ten_seconds, interval: 1) do + has_css?(dropdown_menu_user_link_selector, wait: ten_seconds, text: at_username) + end + find(dropdown_menu_user_link_selector, text: at_username).click end def wait_assignees_block_finish_loading 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 |