Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 119 deletions

diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml
index 99408419d86..1afc4eb8c97 100644
--- a/.gitlab/ci/notify.gitlab-ci.yml
+++ b/.gitlab/ci/notify.gitlab-ci.yml
@@ -3,74 +3,6 @@
   dependencies: []
   cache: {}
 
-.notify-slack:
-  extends:
-    - .notify-defaults
-  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}alpine/curl
-  variables:
-    MERGE_REQUEST_URL: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
-  before_script:
-    - apk update && apk add git bash
-    - echo "NOTIFY_CHANNEL is ${NOTIFY_CHANNEL}"
-    - echo "CI_PIPELINE_URL is ${CI_PIPELINE_URL}"
-
-notify-update-gitaly:
-  extends:
-    - .notify-slack
-  rules:
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $GITALY_UPDATE_BRANCH'
-      when: on_failure
-      allow_failure: true
-  variables:
-    NOTIFY_CHANNEL: g_gitaly
-    GITALY_UPDATE_BRANCH: release-tools/update-gitaly
-  script:
-    - 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:
-    - .notify-slack
-    - .delivery:rules:security-pipeline-merge-result-failure
-  variables:
-    NOTIFY_CHANNEL: f_upcoming_release
-  script:
-    # <!subteam^S0127FU8PDE> mentions the `@release-managers` group
-    - scripts/slack ${NOTIFY_CHANNEL} "<!subteam^S0127FU8PDE> ☠️  Pipeline for merged result failed! ☠️ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing "GitLab Release Tools Bot"
-
-notify-pipeline-failure:
-  extends:
-    - .notify-defaults
-    - .notify:rules:notify-pipeline-failure
-  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}
-  variables:
-    INCIDENT_PROJECT: "${BROKEN_BRANCH_INCIDENTS_PROJECT}"
-    BROKEN_BRANCH_PROJECT_TOKEN: "${BROKEN_BRANCH_INCIDENTS_PROJECT_TOKEN}"
-    INCIDENT_JSON: "${CI_PROJECT_DIR}/incident.json"
-    SLACK_CHANNEL: "${NOTIFY_PIPELINE_FAILURE_CHANNEL}"
-    FAILED_PIPELINE_SLACK_MESSAGE_FILE: "${CI_PROJECT_DIR}/failed_pipeline_slack_message.json"
-  before_script:
-    - source scripts/utils.sh
-    - apt-get update && apt-get install -y jq
-    - install_gitlab_gem
-  script:
-    - |
-      if [[ "${CREATE_INCIDENT_FOR_PIPELINE_FAILURE}" == "true" ]]; then
-        scripts/create-pipeline-failure-incident.rb -p ${INCIDENT_PROJECT} -f ${INCIDENT_JSON} -t ${BROKEN_BRANCH_PROJECT_TOKEN} ||
-          scripts/slack ${SLACK_CHANNEL} "☠️  Broken pipeline incident creation failed! ☠️  See ${CI_JOB_URL}" ci_failing "Failed pipeline reporter";
-        echosuccess "Created incident $(jq '.web_url' ${INCIDENT_JSON})";
-      fi
-    - |
-      scripts/generate-failed-pipeline-slack-message.rb -p ${INCIDENT_PROJECT} -i ${INCIDENT_JSON} -f ${FAILED_PIPELINE_SLACK_MESSAGE_FILE};
-      curl -X POST -H 'Content-Type: application/json' --data @${FAILED_PIPELINE_SLACK_MESSAGE_FILE} "$CI_SLACK_WEBHOOK_URL" ||
-        scripts/slack ${SLACK_CHANNEL} "☠️  Broken pipeline notification failed! ☠️  See ${CI_JOB_URL}" ci_failing "Failed pipeline reporter";
-
-  artifacts:
-    paths:
-      - ${INCIDENT_JSON}
-      - ${FAILED_PIPELINE_SLACK_MESSAGE_FILE}
-    when: always
-    expire_in: 2 days
-
 create-issues-for-failing-tests:
   extends:
     - .notify-defaults
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml
index bdb9b9a3151..766d819c89b 100644
--- a/.gitlab/ci/review-apps/main.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml
@@ -145,34 +145,6 @@ review-deploy:
     expire_in: 7 days
     when: always
 
-review-deploy-failure-notification:
-  stage: post-deploy
-  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}
-  rules:
-    - when: on_failure
-      allow_failure: true
-  variables:
-    BROKEN_REVIEW_APPS_INCIDENTS_PROJECT: "gitlab-org/quality/engineering-productivity/review-apps-broken-incidents"
-    BROKEN_REVIEW_APPS_INCIDENT_JSON: "${CI_PROJECT_DIR}/incident.json"
-    SLACK_CHANNEL: "review-apps-broken"
-    FAILED_PIPELINE_SLACK_MESSAGE_FILE: "${CI_PROJECT_DIR}/failed_pipeline_slack_message.json"
-  before_script:
-    - source scripts/utils.sh
-    - apt-get update && apt-get install -y jq
-    - install_gitlab_gem
-  script:
-    # Check that the review-deploy failed. If not, we don't do anything.
-    # It can be possible that other jobs were failing, but here we only
-    # care about review-deploy
-    - curl "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?scope=failed" | jq -e 'any(.name == "review-deploy")'
-    - |
-      scripts/create-pipeline-failure-incident.rb -p ${BROKEN_REVIEW_APPS_INCIDENTS_PROJECT} -f ${BROKEN_REVIEW_APPS_INCIDENT_JSON} -t ${BROKEN_REVIEW_APPS_INCIDENTS_PROJECT_TOKEN};
-      echosuccess "Created incident $(jq '.web_url' ${BROKEN_REVIEW_APPS_INCIDENT_JSON})";
-    - |
-      scripts/generate-failed-pipeline-slack-message.rb -p ${BROKEN_REVIEW_APPS_INCIDENTS_PROJECT} -i ${BROKEN_REVIEW_APPS_INCIDENT_JSON} -f ${FAILED_PIPELINE_SLACK_MESSAGE_FILE};
-      curl -X POST -H 'Content-Type: application/json' --data @${FAILED_PIPELINE_SLACK_MESSAGE_FILE} "$CI_SLACK_WEBHOOK_URL" ||
-        scripts/slack ${SLACK_CHANNEL} "☠️  Broken pipeline notification failed! ☠️  See ${CI_JOB_URL}" ci_failing "Failed pipeline reporter"
-
 review-deploy-sample-projects:
   extends:
     - .review-workflow-base
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index a1caa17d5ab..c8c79decd10 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -157,12 +157,6 @@
 .if-ruby2-branch: &if-ruby2-branch
   if: '$CI_COMMIT_BRANCH == "ruby2"'
 
-# For Security merge requests, the gitlab-release-tools-bot triggers a new
-# pipeline for the "Pipelines for merged results" feature. If the pipeline
-# fails, we notify release managers.
-.if-security-pipeline-merge-result: &if-security-pipeline-merge-result
-  if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "gitlab-org/security" && $GITLAB_USER_LOGIN == "gitlab-release-tools-bot"'
-
 ####################
 # Changes patterns #
 ####################
@@ -837,14 +831,6 @@
     - changes:
         - scripts/lint_templates_bash.rb
 
-##################
-# Delivery rules #
-##################
-.delivery:rules:security-pipeline-merge-result-failure:
-  rules:
-    - <<: *if-security-pipeline-merge-result
-      when: on_failure
-
 ######################
 # Dev fixtures rules #
 ######################
@@ -1126,15 +1112,6 @@
 ##########
 # Notify #
 ##########
-.notify:rules:notify-pipeline-failure:
-  rules:
-    # Don't report child pipeline failures
-    - if: '$CI_PIPELINE_SOURCE == "parent_pipeline"'
-      when: never
-    - if: '$CI_SLACK_WEBHOOK_URL && $NOTIFY_PIPELINE_FAILURE_CHANNEL'
-      when: on_failure
-      allow_failure: true
-
 .notify:rules:create-issues-for-failing-tests:
   rules:
     # Don't report child pipeline failures