ci: Move internal variables to a separate yml file

This way they will not be fetched by release_tool and pollute local configuration for developers. Ticket: QA-517 Signed-off-by: Lluis Campos <[email protected]>
0lmi · Dec 16, 2022 · 70e48f2 · 70e48f2
1 parent 8e9767a
commit 70e48f2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -96,22 +96,8 @@ variables:
   WAIT_IN_STAGE_BUILD: ""
   WAIT_IN_STAGE_TEST: ""
 
-  # Internal address for nfs sstate cache server (northamerica-northeast1-b)
-  SSTATE_CACHE_INTRNL_ADDR: "10.162.0.25"
-
-  # Global environment variables (not meant to be changed)
-  DEBIAN_FRONTEND: noninteractive
-
-  # Docker dind configuration.
-  # To use dind, make sure gitlab-runner's configuration
-  # has a common mount for /certs (i.e. runners.docker.volumes) directory
-  # and that the dind service name is always docker (default hostname).
-  DOCKER_HOST: "tcp://docker:2376"
-  DOCKER_CERT_PATH: "/certs/client"
-  DOCKER_TLS_VERIFY: "1"
-  DOCKER_TLS_CERTDIR: "/certs"
-
 include:
+  - local: "/gitlab-pipeline/internal-variables.yml"
   - project: "Northern.tech/Mender/mendertesting"
     file: ".gitlab-ci-check-commits-signoffs.yml"
   - local: "/gitlab-pipeline/shared/build_and_test_acceptance.yml"

diff --git a/gitlab-pipeline/internal-variables.yml b/gitlab-pipeline/internal-variables.yml
@@ -0,0 +1,15 @@
+variables:
+  # Internal address for nfs sstate cache server (northamerica-northeast1-b)
+  SSTATE_CACHE_INTRNL_ADDR: "10.162.0.25"
+
+  # Global environment variables (not meant to be changed)
+  DEBIAN_FRONTEND: noninteractive
+
+  # Docker dind configuration.
+  # To use dind, make sure gitlab-runner's configuration
+  # has a common mount for /certs (i.e. runners.docker.volumes) directory
+  # and that the dind service name is always docker (default hostname).
+  DOCKER_HOST: "tcp://docker:2376"
+  DOCKER_CERT_PATH: "/certs/client"
+  DOCKER_TLS_VERIFY: "1"
+  DOCKER_TLS_CERTDIR: "/certs"