diff options
author | James Lopez <james@jameslopez.es> | 2018-03-08 13:46:34 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-03-08 13:46:34 +0300 |
commit | b7c47d952708b031d5fedd2644b7a6fe13f53962 (patch) | |
tree | 670ae931b890a931ed1d758379cd28368537a82d /vendor/gitlab-ci-yml | |
parent | 7734e85bc6592c5ad3330c611c5f83a051b680b0 (diff) |
Update templates and licenses
Diffstat (limited to 'vendor/gitlab-ci-yml')
-rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 0ac8885405e..c233e255fe0 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -36,7 +36,6 @@ variables: KUBERNETES_VERSION: 1.8.6 HELM_VERSION: 2.6.1 - CODECLIMATE_VERSION: 0.69.0 stages: - build @@ -286,6 +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/') function sast_container() { if [[ -n "$CI_REGISTRY_USER" ]]; then @@ -306,20 +307,16 @@ production: } function codeclimate() { - cc_opts="--env CODECLIMATE_CODE="$PWD" \ - --volume "$PWD":/code \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume /tmp/cc:/tmp/cc" - - docker run ${cc_opts} "codeclimate/codeclimate:${CODECLIMATE_VERSION}" init - docker run ${cc_opts} "codeclimate/codeclimate:${CODECLIMATE_VERSION}" analyze -f json > codeclimate.json + docker run --env CODECLIMATE_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 } function sast() { case "$CI_SERVER_VERSION" in *-ee) - # 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/') # Deprecation notice for CONFIDENCE_LEVEL variable if [ -z "$SAST_CONFIDENCE_LEVEL" -a "$CONFIDENCE_LEVEL" ]; then @@ -331,7 +328,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:$SAST_VERSION" /app/bin/run /code + "registry.gitlab.com/gitlab-org/security-products/sast:$SCA_VERSION" /app/bin/run /code ;; *) echo "GitLab EE is required" |