From 92db153eda820caea426a4687e8aa9fd8edeb6c3 Mon Sep 17 00:00:00 2001
From: Benjamin Schubert <bschubert15@bloomberg.net>
Date: Wed, 4 Dec 2019 15:36:28 +0000
Subject: .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.
---
 .gitlab-ci.yml | 7 ++++---
 1 file 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                     #
-- 
cgit v1.2.1