summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-07-30 13:49:41 +0200
committerRémy Coutable <remy@rymai.me>2019-08-01 12:45:25 +0200
commit6dad5cc1944f970395d33f85b87c5287686c91f2 (patch)
tree64b8dda6e9f910ad7ec46f03d48a3ded795d5e44
parent0149ebccaba8ee1bae583ccc48947e317319c6e4 (diff)
downloadgitlab-ce-6dad5cc1944f970395d33f85b87c5287686c91f2.tar.gz
Ensure review-stop can run even when the branch has been deleted65321-review-stop-fails-when-the-branch-is-deleted-upon-merge
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index aa722f6ef33..29ed41ce0c6 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -116,17 +116,21 @@ schedule:review-deploy:
<<: *review-schedules-only
review-stop:
- <<: *review-base
+ <<: *review-only
+ extends: .single-script-job-dedicated-runner
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
stage: review
when: manual
allow_failure: true
variables:
- GIT_DEPTH: "1"
+ SCRIPT_NAME: review_apps/review-apps.sh
environment:
<<: *review-environment
action: stop
script:
- - source scripts/review_apps/review-apps.sh
+ - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/utils.sh
+ - source utils.sh
+ - source $(basename $SCRIPT_NAME)
- delete
.review-qa-base: &review-qa-base