Allow MR pipelines in latest DAST template
What does this MR do?
Related to #217668 (closed)
As per my proposal in #217668 (comment 502308480), this updates the DAST template to also work with Merge Request pipelines, reusing the technique shown in https://docs.gitlab.com/ee/ci/yaml/README.html#switch-between-branch-pipelines-and-merge-request-pipelines
- If users have
workflow: rules
that prevent merge request pipelines, there will be no change. - If users have
workflow: rules
that prevent branch pipelines, and only MR pipelines, they will finally be able to use this template without overriding the jobrules
to match their pipeline. It can be added as-is to new pipelines, and those who already override with their own rules won't be affected. - If users have config that allows both branch and MR pipelines, the job will run in branch pipelines for every push to the branch, until an MR is created. Then it will stop running in branch pipelines, and start running in MR pipelines, without duplication, thanks to the use of the
$CI_OPEN_MERGE_REQUESTS
variable.
Another way to look at it is that it "prefers" MR pipelines, but if there is no MR, or MR pipelines are disabled, it'll run in branch pipelines.
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
-
I have included a changelog entry, or it's not needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Edited by Marcel Amirault