diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2c02ebc..e53eb33e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,25 +96,8 @@ variables: WAIT_IN_STAGE_BUILD: "" WAIT_IN_STAGE_TEST: "" - # Maintenance - CLEAN_BUILD_CACHE: "" - - # 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 new file mode 100644 index 00000000..f107e28c --- /dev/null +++ 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"