summaryrefslogtreecommitdiff
path: root/.gitlab/ci/reports.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-10 12:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-10 12:08:58 +0000
commit0211553b0cd32ddcd49fbe61fdb318984d15af18 (patch)
treef95d5876dfee2d1ff158f38a676167501e6519db /.gitlab/ci/reports.gitlab-ci.yml
parent23ff717a29540bb1d4b0068f164b5f9df99386bf (diff)
downloadgitlab-ce-0211553b0cd32ddcd49fbe61fdb318984d15af18.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/reports.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/reports.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index 4c183c297d5..65abb6c5cba 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -94,9 +94,9 @@ dependency_scanning:
stage: test
needs: []
variables:
+ DS_MAJOR_VERSION: 2
DS_EXCLUDED_PATHS: "qa/qa/ee/fixtures/secure_premade_reports,spec,ee/spec" # GitLab-specific
script:
- - export DS_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
- |
if ! docker info &>/dev/null; then
if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
@@ -138,7 +138,7 @@ dependency_scanning:
) \
--volume "$PWD:/code" \
--volume /var/run/docker.sock:/var/run/docker.sock \
- "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$DS_VERSION" /code
+ "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$DS_MAJOR_VERSION" /code
artifacts:
paths:
- gl-dependency-scanning-report.json # GitLab-specific