Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 0 deletions

diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 17a8bbbb21d..d10b2b59c35 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -42,6 +42,23 @@ review-cleanup:
   script:
     - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
 
+review-gcp-cleanup:
+  extends:
+    - .review:rules:review-gcp-cleanup
+  stage: prepare
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk:latest
+  allow_failure: true
+  environment:
+    name: review/auto-gcp-cleanup
+    action: stop
+  before_script:
+    - gcloud auth activate-service-account --key-file=$REVIEW_APPS_GCP_CREDENTIALS
+    - gcloud config set project $REVIEW_APPS_GCP_PROJECT
+    - apt-get install -y jq
+    - source scripts/review_apps/gcp_cleanup.sh
+  script:
+    - gcp_cleanup
+
 review-build-cng:
   extends:
     - .default-retry
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 3dc09b9988e..c083116cc27 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -496,6 +496,13 @@
     - <<: *if-dot-com-gitlab-org-schedule
       when: on_success
 
+.review:rules:review-gcp-cleanup:
+  rules:
+    - <<: *if-dot-com-gitlab-org-merge-request
+      when: manual
+    - <<: *if-dot-com-gitlab-org-schedule
+      when: on_success
+
 .review:rules:danger:
   rules:
     - if: '$DANGER_GITLAB_API_TOKEN && $CI_MERGE_REQUEST_IID'