summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <bschubert15@bloomberg.net>2019-12-04 15:36:28 +0000
committerBenjamin Schubert <bschubert15@bloomberg.net>2019-12-04 16:04:12 +0000
commit92db153eda820caea426a4687e8aa9fd8edeb6c3 (patch)
tree3e526ca3d7c2cffe5e84a58e5987ceba776be8c3
parent80e2d0ba60909a4413c067a2d2f504e53eed7a8c (diff)
downloadbuildstream-bschubert/ci-improvements.tar.gz
.gitlab-ci.yml: Don't overwrite sast job directly, just inject variablebschubert/ci-improvements
We can remove the sast job overwriting and instead 'just' add the variable it needs to the global variables.
-rw-r--r--.gitlab-ci.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e64a1a968..e33b7c36f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,8 +16,12 @@ stages:
- publish
variables:
+ # SAST related variables
SAST_DISABLE_DIND: "true"
SAST_GOSEC_LEVEL: 2
+ CI_PROJECT_REPOSITORY_LANGUAGES: "python"
+
+ # Our own variables
# Version of the docker images we should use for all the images.
# This is taken from buildstream/buildstream-docker-images
DOCKER_IMAGE_VERSION: master-100413107
@@ -28,9 +32,6 @@ variables:
EXTERNAL_TESTS_COMMAND: "tox -e py35-external,py36-external,py37-external -- ${PYTEST_ARGS}"
COVERAGE_PREFIX: "${CI_JOB_NAME}."
-sast:
- variables:
- CI_PROJECT_REPOSITORY_LANGUAGES: "python"
#####################################################
# Test stage #