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: ...@@ -116,7 +116,6 @@ schedule:review-build-cng:
extends: extends:
- .default-tags - .default-tags
- .default-retry - .default-retry
- .default-only
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
dependencies: [] dependencies: []
variables: variables:
...@@ -156,10 +155,11 @@ schedule:review-build-cng: ...@@ -156,10 +155,11 @@ schedule:review-build-cng:
when: always when: always
review-deploy: review-deploy:
extends: extends: .review-deploy-base
- .review-deploy-base rules:
- .only-review - <<: *if-canonical-gitlab-and-merge-request
- .only:changes-code-qa changes: *code-qa-patterns
when: on_success
schedule:review-deploy: schedule:review-deploy:
extends: extends:
...@@ -167,10 +167,7 @@ schedule:review-deploy: ...@@ -167,10 +167,7 @@ schedule:review-deploy:
- .only-review-schedules - .only-review-schedules
.base-review-stop: .base-review-stop:
extends: extends: .review-workflow-base
- .review-workflow-base
- .only-review
- .only:changes-code-qa
environment: environment:
action: stop action: stop
variables: variables:
...@@ -187,12 +184,19 @@ schedule:review-deploy: ...@@ -187,12 +184,19 @@ schedule:review-deploy:
review-stop-failed-deployment: review-stop-failed-deployment:
extends: .base-review-stop extends: .base-review-stop
stage: prepare stage: prepare
rules:
- <<: *if-canonical-gitlab-and-merge-request
changes: *code-qa-patterns
when: on_success
script: script:
- delete_failed_release - delete_failed_release
review-stop: review-stop:
extends: .base-review-stop extends: .base-review-stop
stage: review stage: review
rules:
- <<: *if-canonical-gitlab-and-merge-request
changes: *code-qa-patterns
when: manual when: manual
allow_failure: true allow_failure: true
script: script:
...@@ -271,10 +275,11 @@ review-qa-all: ...@@ -271,10 +275,11 @@ review-qa-all:
performance: performance.json performance: performance.json
review-performance: review-performance:
extends: extends: .review-performance-base
- .review-performance-base rules:
- .only-review - <<: *if-canonical-gitlab-and-merge-request
- .only:changes-code-qa changes: *code-qa-patterns
when: on_success
needs: ["review-deploy"] needs: ["review-deploy"]
dependencies: ["review-deploy"] dependencies: ["review-deploy"]
before_script: 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