diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 12:07:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 12:07:59 +0000 |
| commit | af8c2a780dc52175fcb9e79ad516772202b88aec (patch) | |
| tree | 16ff41ca3972e90a46a8b89663c73f98e1059bd6 /.gitlab | |
| parent | 59026a49b3affb3c6c3bc6ecc67b20c811623e70 (diff) | |
| download | gitlab-ce-af8c2a780dc52175fcb9e79ad516772202b88aec.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 7e0759b3c85..53311ab08d3 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -116,7 +116,6 @@ schedule:review-build-cng: extends: - .default-tags - .default-retry - - .default-only image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base dependencies: [] variables: @@ -156,10 +155,11 @@ schedule:review-build-cng: when: always review-deploy: - extends: - - .review-deploy-base - - .only-review - - .only:changes-code-qa + extends: .review-deploy-base + rules: + - <<: *if-canonical-gitlab-and-merge-request + changes: *code-qa-patterns + when: on_success schedule:review-deploy: extends: @@ -167,10 +167,7 @@ schedule:review-deploy: - .only-review-schedules .base-review-stop: - extends: - - .review-workflow-base - - .only-review - - .only:changes-code-qa + extends: .review-workflow-base environment: action: stop variables: @@ -187,13 +184,20 @@ schedule:review-deploy: review-stop-failed-deployment: extends: .base-review-stop stage: prepare + rules: + - <<: *if-canonical-gitlab-and-merge-request + changes: *code-qa-patterns + when: on_success script: - delete_failed_release review-stop: extends: .base-review-stop stage: review - when: manual + rules: + - <<: *if-canonical-gitlab-and-merge-request + changes: *code-qa-patterns + when: manual allow_failure: true script: - delete_release @@ -271,10 +275,11 @@ review-qa-all: performance: performance.json review-performance: - extends: - - .review-performance-base - - .only-review - - .only:changes-code-qa + extends: .review-performance-base + rules: + - <<: *if-canonical-gitlab-and-merge-request + changes: *code-qa-patterns + when: on_success needs: ["review-deploy"] dependencies: ["review-deploy"] before_script: |