diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-01 08:43:57 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-01 08:43:57 +0000 |
| commit | 6c5015ef7c185bbeeb88c4c93dd5a3ffe11919ec (patch) | |
| tree | e1c669d78a6ffb01ee75cfb6ad83d894efb868a6 | |
| parent | 1b5c0b475ec0860368e6ff4be4127e0b89d733d3 (diff) | |
| parent | 2c2556f9d9c4ef5ca0a94194f5aa2d52fa3cb8f1 (diff) | |
| download | gitlab-ce-6c5015ef7c185bbeeb88c4c93dd5a3ffe11919ec.tar.gz | |
Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'
Skip creating auto devops jobs for sast, container_scanning, dast,…
See merge request gitlab-org/gitlab-ce!21959
| -rw-r--r-- | changelogs/unreleased/48399-skip-auto-devops-jobs-based-on-license.yml | 6 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/changelogs/unreleased/48399-skip-auto-devops-jobs-based-on-license.yml b/changelogs/unreleased/48399-skip-auto-devops-jobs-based-on-license.yml new file mode 100644 index 00000000000..042731fb9be --- /dev/null +++ b/changelogs/unreleased/48399-skip-auto-devops-jobs-based-on-license.yml @@ -0,0 +1,6 @@ +--- +title: Skip creating auto devops jobs for sast, container_scanning, dast, dependency_scanning + when not licensed +merge_request: 21959 +author: +type: performance diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index d8fcdfac266..aebaf2d6982 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -162,7 +162,10 @@ sast: artifacts: paths: [gl-sast-report.json] only: - - branches + refs: + - branches + variables: + - $GITLAB_FEATURES =~ /\bsast\b/ except: variables: - $SAST_DISABLED @@ -179,7 +182,10 @@ dependency_scanning: artifacts: paths: [gl-dependency-scanning-report.json] only: - - branches + refs: + - branches + variables: + - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ except: variables: - $DEPENDENCY_SCANNING_DISABLED @@ -196,7 +202,10 @@ container_scanning: artifacts: paths: [gl-container-scanning-report.json] only: - - branches + refs: + - branches + variables: + - $GITLAB_FEATURES =~ /\bsast_container\b/ except: variables: - $CONTAINER_SCANNING_DISABLED @@ -215,6 +224,8 @@ dast: refs: - branches kubernetes: active + variables: + - $GITLAB_FEATURES =~ /\bdast\b/ except: refs: - master |