Commit 6dfd5bde authored by Rémy Coutable's avatar Rémy Coutable

Split a Review Apps CI rule into two dedicated rules

In-order to prevent `review-performance` from running, a condition was
set in `.review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise`
in `.gitlab/ci/rules.gitlab-ci.yml` file, but this also prevented
`review-deploy` from running as `review-deploy` also extended
`.review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise`.

Since the `dast` jobs are set to `needs: ["review-deploy"]`, the CI
config was invalid. Unfortunately, when for scheduled pipeline, there's
no error logged or raised.
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 75bc2125
...@@ -53,7 +53,7 @@ review-build-cng: ...@@ -53,7 +53,7 @@ review-build-cng:
review-deploy: review-deploy:
extends: extends:
- .review-workflow-base - .review-workflow-base
- .review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise - .review:rules:review-deploy
stage: review stage: review
dependencies: [] dependencies: []
resource_group: "review/${CI_COMMIT_REF_NAME}" resource_group: "review/${CI_COMMIT_REF_NAME}"
...@@ -172,7 +172,7 @@ review-qa-all: ...@@ -172,7 +172,7 @@ review-qa-all:
review-performance: review-performance:
extends: extends:
- .default-retry - .default-retry
- .review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise - .review:rules:review-performance
image: image:
name: sitespeedio/sitespeed.io:6.3.1 name: sitespeedio/sitespeed.io:6.3.1
entrypoint: [""] entrypoint: [""]
......
...@@ -669,7 +669,23 @@ ...@@ -669,7 +669,23 @@
allow_failure: true allow_failure: true
- <<: *if-dot-com-gitlab-org-schedule - <<: *if-dot-com-gitlab-org-schedule
.review:rules:mr-and-schedule-auto-if-frontend-manual-otherwise: .review:rules:review-deploy:
rules:
- <<: *if-not-ee
when: never
- <<: *if-dot-com-gitlab-org-merge-request
changes: *ci-review-patterns
- <<: *if-dot-com-gitlab-org-merge-request
changes: *frontend-patterns
allow_failure: true
- <<: *if-dot-com-gitlab-org-merge-request
changes: *code-qa-patterns
when: manual
allow_failure: true
- <<: *if-dot-com-gitlab-org-schedule
allow_failure: true
.review:rules:review-performance:
rules: rules:
- if: '$DAST_RUN == "true"' # Skip this job when DAST is run - if: '$DAST_RUN == "true"' # Skip this job when DAST is run
when: never when: never
......
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