diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-01 13:12:49 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-08-01 13:12:49 +0000 |
| commit | 2cf9769d12bb93c7a55432f8c8c08e89e6735461 (patch) | |
| tree | bd644b1c693a4dd8ecab1d1f6a4120ec7161b262 | |
| parent | fc09bb0770ab74572cb2cf706180dce7503e19a0 (diff) | |
| parent | 6dad5cc1944f970395d33f85b87c5287686c91f2 (diff) | |
| download | gitlab-ce-2cf9769d12bb93c7a55432f8c8c08e89e6735461.tar.gz | |
Merge branch '65321-review-stop-fails-when-the-branch-is-deleted-upon-merge' into 'master'
Ensure `review-stop` can run even when the branch has been deleted
Closes #65321
See merge request gitlab-org/gitlab-ce!31277
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 10 |
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 |