Commit 13adffbc authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'fix-remove-branch-pipeline' into 'master'

review-performance (and other review jobs) should also use `rules`

See merge request gitlab-org/gitlab!22236
parents 6f4831a0 60f29ca3
......@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment