From 76be9cc67dcb566e5c0c8db9f608898e28e961f3 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Oct 06 2021 10:27:31 +0000
Subject: Configure Secret Detection in `.gitlab-ci.yml`, creating this file if it does not already exist


---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 101e210..3f78a42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,65 +1,68 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 image: registry.opensuse.org/opensuse/infrastructure/containers/heroes-salt-testing:latest
-
 variables:
   DOCKER_DRIVER: overlay2
-
 stages:
-  - validate
-  - test
-  - deploy
-
+- validate
+- test
+- deploy
 validate:
   stage: validate
   before_script:
-    - bin/prepare_test_env.sh -i opensuse
+  - bin/prepare_test_env.sh -i opensuse
   script: bin/test_validate.sh
   tags:
-    - docker
-
+  - docker
 leap15.2_show_highstate:
   stage: validate
   before_script:
-    - bin/prepare_test_env.sh -i opensuse -g -o Leap,15,2
-    - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas' --clone-branch production
+  - bin/prepare_test_env.sh -i opensuse -g -o Leap,15,2
+  - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas'
+    --clone-branch production
   script: bin/test_show_highstate.sh
   tags:
-    - docker
-
+  - docker
 upstream_formulas_show_highstate:
   stage: validate
   before_script:
-    - bin/prepare_test_env.sh -i opensuse -g
-    - bin/get_formulas.py -c -d /srv/formula -s
+  - bin/prepare_test_env.sh -i opensuse -g
+  - bin/get_formulas.py -c -d /srv/formula -s
   script: bin/test_show_highstate.sh
   allow_failure: true
   except:
-    - production@infra/salt
+  - production@infra/salt
   tags:
-    - docker
-
+  - docker
 test_nginx:
   image: registry.opensuse.org/opensuse/infrastructure/containers/heroes-salt-testing-nginx:latest
   stage: test
   before_script:
-    - bin/prepare_test_env.sh -i opensuse -g 
-    - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas' --clone-branch production -f nginx
+  - bin/prepare_test_env.sh -i opensuse -g
+  - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas'
+    --clone-branch production -f nginx
   script: bin/test_nginx.sh
   tags:
-    - docker
-
+  - docker
 test_sudo:
   stage: test
   before_script:
-    - bin/prepare_test_env.sh -i opensuse -g
-    - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas' --clone-branch production
+  - bin/prepare_test_env.sh -i opensuse -g
+  - bin/get_formulas.py -c -d /srv/formula -s --clone-from 'https://gitlab.infra.opensuse.org/saltstack-formulas'
+    --clone-branch production
   script: bin/test_sudo.sh
   tags:
-    - docker
-
+  - docker
 deploy_job:
   stage: deploy
   script: sudo salt-call event.fire_master $CI_DEPLOY_PASSWORD salt/fileserver/gitfs/update
   only:
-    - production@infra/salt
+  - production@infra/salt
   tags:
-    - salt-deploy
+  - salt-deploy
+include:
+- template: Auto-DevOps.gitlab-ci.yml