diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-03 13:53:19 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-03 13:53:19 +0000 |
| commit | 420442c5036b08652a758179d893bf8fe2b798ef (patch) | |
| tree | 6e4bae9f6c836e2c66272fc582f3f2258a09602b | |
| parent | e39d2aec88e10c51493623a1d79e9a4abb7d064f (diff) | |
| parent | d2b15f2a08997e9d843807f9c52c7a251f0c7185 (diff) | |
| download | gitlab-ce-420442c5036b08652a758179d893bf8fe2b798ef.tar.gz | |
Merge branch '54844-report-syntax-dep-scan-ado' into 'master'
Use reports syntax for Dependency scanning job
Closes #54844
See merge request gitlab-org/gitlab-ce!24081
| -rw-r--r-- | changelogs/unreleased/54844-report-syntax-dep-scan-ado.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/changelogs/unreleased/54844-report-syntax-dep-scan-ado.yml b/changelogs/unreleased/54844-report-syntax-dep-scan-ado.yml new file mode 100644 index 00000000000..95fc5cb804d --- /dev/null +++ b/changelogs/unreleased/54844-report-syntax-dep-scan-ado.yml @@ -0,0 +1,5 @@ +--- +title: Use reports syntax for Dependency scanning in Auto DevOps +merge_request: 24081 +author: +type: added diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index e447653de4c..e937d372384 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -359,6 +359,9 @@ Any security warnings are also NOTE: **Note:** The Auto Dependency Scanning stage will be skipped on licenses other than Ultimate. +NOTE: **Note:** +The Auto Dependency Scanning job requires GitLab Runner 11.5 or above. + ### Auto License Management **[ULTIMATE]** > Introduced in [GitLab Ultimate][ee] 11.0. diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index a9e361b0b32..8f6cf8d2d03 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -185,7 +185,8 @@ dependency_scanning: - setup_docker - dependency_scanning artifacts: - paths: [gl-dependency-scanning-report.json] + reports: + dependency_scanning: gl-dependency-scanning-report.json only: refs: - branches |