Merge branch 'skip-sast-on-ce' into 'master'

Avoid running autodevops sast job on GitLab CE Closes gl-sast#3 See merge request gitlab-org/gitlab-ce!15962 (cherry picked from commit 169a8c35) 8153f734 Avoid running autodevops sast job on GitLab CE

Merge branch 'skip-sast-on-ce' into 'master'
17b9d86a · Kamil Trzciński · Oswaldo Ferreira · 6f1c38d2 · 17b9d86a
Commit 17b9d86a authored Dec 16, 2017 by Kamil Trzciński Committed by Oswaldo Ferreira Dec 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

Auto-DevOps.gitlab-ci.yml vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +12 -1

No files found.
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -89,7 +89,7 @@ sast:
    POSTGRES_DB: "false"
  allow_failure: true
  script:
-    - /app/bin/run .
+    - sast .
  artifacts:
    paths: [gl-sast-report.json]

@@ -232,6 +232,17 @@ production:
    docker run ${cc_opts} codeclimate/codeclimate:0.69.0 analyze -f json > codeclimate.json
  }

+  function sast() {
+    case "$CI_SERVER_VERSION" in
+      *-ee)
+        /app/bin/run "$@"
+        ;;
+      *)
+        echo "GitLab EE is required"
+        ;;
+    esac
+  }
+
  function deploy() {
    track="${1-stable}"
    name="$CI_ENVIRONMENT_SLUG"