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 17:18:37 +0000
commit45b14862cf6204579daafb49065591726bb004ed (patch)
treea8252063bbfa13e7ac55d8d8138c77e2f2a98e94
parent1d789566fa90a49b44c54285019553a0a08a358b (diff)
downloadbuildstream-45b14862cf6204579daafb49065591726bb004ed.tar.gz
.gitlab-ci.yml: Don't overwrite sast job directly, just inject variable
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 ee5732113..05932c443 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 #