diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-16 15:59:17 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-19 12:40:18 -0500 |
| commit | 706ab1adf895815ef7029aa3d5bbc9375184548c (patch) | |
| tree | 049308fa412a5e1283c6627c119f7ad671826a70 | |
| parent | 505bc53817511dbfce53f80bccae638a0d096704 (diff) | |
| download | gitlab-ce-706ab1adf895815ef7029aa3d5bbc9375184548c.tar.gz | |
Merge branch 'update_vendored_gitlab_ci_yml' into 'master'
Update vendored gitlab-ci.yml template for auto-devops
See merge request gitlab-org/gitlab-ce!17804
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 33f9efc1490..4223dc18933 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -285,8 +285,8 @@ production: export CI_APPLICATION_TAG=$CI_COMMIT_SHA export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID} export TILLER_NAMESPACE=$KUBE_NAMESPACE - # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Static Code Analysis - export SCA_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') + # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products + export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') function sast_container() { if [[ -n "$CI_REGISTRY_USER" ]]; then @@ -307,11 +307,10 @@ production: } function codeclimate() { - docker run --env CODECLIMATE_CODE="$PWD" \ + docker run --env SOURCE_CODE="$PWD" \ --volume "$PWD":/code \ --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume /tmp/cc:/tmp/cc \ - "registry.gitlab.com/gitlab-org/security-products/codequality/codeclimate:${SCA_VERSION}" analyze -f json > codeclimate.json + "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code } function sast() { @@ -328,7 +327,7 @@ production: --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:$SCA_VERSION" /app/bin/run /code + "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code ;; *) echo "GitLab EE is required" |