summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Zagorodny <vzagorodny@gitlab.com>2019-05-24 01:14:10 +0300
committerVictor Zagorodny <vzagorodny@gitlab.com>2019-05-24 01:35:27 +0300
commit6f0b88548761af1bff037fc5dc2a7820eb8b84f7 (patch)
tree57442107a1e68ba8cf6855afb824fa5de4f1ab39
parent792b79b6b7b68b62ebf154c895ebe7836c45af10 (diff)
downloadgitlab-ce-6f0b88548761af1bff037fc5dc2a7820eb8b84f7.tar.gz
FIXME: keep only SAST in the pipeline
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--.gitlab/ci/reports.gitlab-ci.yml106
2 files changed, 62 insertions, 62 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44beccd966a..f92ed29a64b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,13 +36,13 @@ stages:
include:
- local: .gitlab/ci/global.gitlab-ci.yml
- - local: .gitlab/ci/cng.gitlab-ci.yml
- - local: .gitlab/ci/docs.gitlab-ci.yml
- - local: .gitlab/ci/frontend.gitlab-ci.yml
- - local: .gitlab/ci/pages.gitlab-ci.yml
- - local: .gitlab/ci/qa.gitlab-ci.yml
+# - local: .gitlab/ci/cng.gitlab-ci.yml
+# - local: .gitlab/ci/docs.gitlab-ci.yml
+# - local: .gitlab/ci/frontend.gitlab-ci.yml
+# - local: .gitlab/ci/pages.gitlab-ci.yml
+# - local: .gitlab/ci/qa.gitlab-ci.yml
- local: .gitlab/ci/reports.gitlab-ci.yml
- - local: .gitlab/ci/rails.gitlab-ci.yml
- - local: .gitlab/ci/review.gitlab-ci.yml
- - local: .gitlab/ci/setup.gitlab-ci.yml
- - local: .gitlab/ci/test-metadata.gitlab-ci.yml
+# - local: .gitlab/ci/rails.gitlab-ci.yml
+# - local: .gitlab/ci/review.gitlab-ci.yml
+# - local: .gitlab/ci/setup.gitlab-ci.yml
+# - local: .gitlab/ci/test-metadata.gitlab-ci.yml
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index f942fe88e23..8da85785e97 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -1,16 +1,16 @@
-include:
- - template: Code-Quality.gitlab-ci.yml
-
-code_quality:
- extends: .dedicated-no-docs-no-db-pull-cache-job
- # gitlab-org runners set `privileged: false` but we need to have it set to true
- # since we're using Docker in Docker
- tags: []
- before_script: []
- cache: {}
- dependencies: []
- variables:
- SETUP_DB: "false"
+#include:
+# - template: Code-Quality.gitlab-ci.yml
+#
+#code_quality:
+# extends: .dedicated-no-docs-no-db-pull-cache-job
+# # gitlab-org runners set `privileged: false` but we need to have it set to true
+# # since we're using Docker in Docker
+# tags: []
+# before_script: []
+# cache: {}
+# dependencies: []
+# variables:
+# SETUP_DB: "false"
sast:
extends: .dedicated-no-docs-no-db-pull-cache-job
@@ -58,43 +58,43 @@ sast:
reports:
sast: gl-sast-report.json
-dependency_scanning:
- extends: .dedicated-no-docs-no-db-pull-cache-job
- image: docker:stable
- variables:
- DOCKER_DRIVER: overlay2
- allow_failure: true
- tags: []
- before_script: []
- cache: {}
- dependencies: []
- services:
- - docker:stable-dind
- script:
- - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- - | # this is required to avoid undesirable reset of Docker image ENV variables being set on build stage
- function propagate_env_vars() {
- CURRENT_ENV=$(printenv)
-
- for VAR_NAME; do
- echo $CURRENT_ENV | grep "${VAR_NAME}=" > /dev/null && echo "--env $VAR_NAME "
- done
- }
- - |
- docker run \
- $(propagate_env_vars \
- DS_ANALYZER_IMAGES \
- DS_ANALYZER_IMAGE_PREFIX \
- DS_ANALYZER_IMAGE_TAG \
- DS_DEFAULT_ANALYZERS \
- DEP_SCAN_DISABLE_REMOTE_CHECKS \
- DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
- DS_PULL_ANALYZER_IMAGE_TIMEOUT \
- DS_RUN_ANALYZER_TIMEOUT \
- ) \
- --volume "$PWD:/code" \
- --volume /var/run/docker.sock:/var/run/docker.sock \
- "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
- artifacts:
- reports:
- dependency_scanning: gl-dependency-scanning-report.json
+#dependency_scanning:
+# extends: .dedicated-no-docs-no-db-pull-cache-job
+# image: docker:stable
+# variables:
+# DOCKER_DRIVER: overlay2
+# allow_failure: true
+# tags: []
+# before_script: []
+# cache: {}
+# dependencies: []
+# services:
+# - docker:stable-dind
+# script:
+# - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+# - | # this is required to avoid undesirable reset of Docker image ENV variables being set on build stage
+# function propagate_env_vars() {
+# CURRENT_ENV=$(printenv)
+#
+# for VAR_NAME; do
+# echo $CURRENT_ENV | grep "${VAR_NAME}=" > /dev/null && echo "--env $VAR_NAME "
+# done
+# }
+# - |
+# docker run \
+# $(propagate_env_vars \
+# DS_ANALYZER_IMAGES \
+# DS_ANALYZER_IMAGE_PREFIX \
+# DS_ANALYZER_IMAGE_TAG \
+# DS_DEFAULT_ANALYZERS \
+# DEP_SCAN_DISABLE_REMOTE_CHECKS \
+# DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
+# DS_PULL_ANALYZER_IMAGE_TIMEOUT \
+# DS_RUN_ANALYZER_TIMEOUT \
+# ) \
+# --volume "$PWD:/code" \
+# --volume /var/run/docker.sock:/var/run/docker.sock \
+# "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
+# artifacts:
+# reports:
+# dependency_scanning: gl-dependency-scanning-report.json