From 8e9767a8a84ec7d9121bb9d79406f23830aa41a2 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Fri, 16 Dec 2022 11:23:38 +0100 Subject: [PATCH 1/2] chore: Remove deprecated `CLEAN_BUILD_CACHE` variable Now we have a fancy job in the master VM doing this for us. Signed-off-by: Lluis Campos --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2c02ebc..e37629d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,9 +96,6 @@ 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" From 70e48f27119613a5579dd338b3c8f094da14ff89 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Fri, 16 Dec 2022 11:25:59 +0100 Subject: [PATCH 2/2] 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 --- .gitlab-ci.yml | 16 +--------------- gitlab-pipeline/internal-variables.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 gitlab-pipeline/internal-variables.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e37629d1..e53eb33e 100644 --- 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 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"