diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-02-16 15:41:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-02-16 15:41:52 +0000 |
| commit | 5935cb0cf6f789c1e64aecf172d53d1bab3880fd (patch) | |
| tree | f79e16e1217e3e801a59537c6ee0d65f7dac940d | |
| parent | 0433ce3827de76e934d381d565e58fc89836bc80 (diff) | |
| parent | e19d45ddcfefe13343312ba4bd8ad1c1563394ba (diff) | |
| download | gitlab-ce-5935cb0cf6f789c1e64aecf172d53d1bab3880fd.tar.gz | |
Merge branch 'update-vendored-auto-devops-template-for-latest-sast-changes' into 'master'
Update vendored AutoDevOps YML for latest SAST changes
See merge request gitlab-org/gitlab-ce!17178
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 094d6791505..0ac8885405e 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -321,7 +321,15 @@ production: # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" SAST_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - docker run --volume "$PWD:/code" \ + # Deprecation notice for CONFIDENCE_LEVEL variable + if [ -z "$SAST_CONFIDENCE_LEVEL" -a "$CONFIDENCE_LEVEL" ]; then + SAST_CONFIDENCE_LEVEL="$CONFIDENCE_LEVEL" + echo "WARNING: CONFIDENCE_LEVEL is deprecated and MUST be replaced with SAST_CONFIDENCE_LEVEL" + fi + + docker run --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" \ + --env SAST_DISABLE_REMOTE_CHECKS="${SAST_DISABLE_REMOTE_CHECKS:-false}" \ + --volume "$PWD:/code" \ --volume /var/run/docker.sock:/var/run/docker.sock \ "registry.gitlab.com/gitlab-org/security-products/sast:$SAST_VERSION" /app/bin/run /code ;; |