diff mbox series

[1/2] CI: Factor out CACHE_DIR to improve mirror configurability

Message ID 20230216162437.1232175-1-peter.hoyes@arm.com
State New
Headers show
Series [1/2] CI: Factor out CACHE_DIR to improve mirror configurability | expand

Commit Message

Peter Hoyes Feb. 16, 2023, 4:24 p.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

Mirrors of meta-arm may have the persistent cache directory mounted in a
different place. To make it easier to configure, define this location
using a single $CACHE_DIR variable.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Jon Mason Feb. 17, 2023, 4:30 a.m. UTC | #1 
On Thu, 16 Feb 2023 16:24:36 +0000, Peter Hoyes wrote:
> Mirrors of meta-arm may have the persistent cache directory mounted in a
> different place. To make it easier to configure, define this location
> using a single $CACHE_DIR variable.

Applied, thanks!

[1/2] CI: Factor out CACHE_DIR to improve mirror configurability
      commit: ae3b2198879eed2c5a4646e372ef151ebf1f12e4
[2/2] CI: Collect testimage logs on failure
      commit: c5bf0354907b031b3ce3cdc3977cc4f70e28d00b

Best regards,
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1537b7a..6a286900 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@  image: ghcr.io/siemens/kas/kas:3.2
 variables:
   CPU_REQUEST: ""
   DEFAULT_TAG: ""
+  CACHE_DIR: $CI_BUILDS_DIR/persist
   # These are needed as the k8s executor doesn't respect the container entrypoint
   # by default
   FF_KUBERNETES_HONOR_ENTRYPOINT: 1
@@ -23,11 +24,11 @@  stages:
   interruptible: true
   variables:
     KAS_WORK_DIR: $CI_PROJECT_DIR/work
-    KAS_REPO_REF_DIR: $CI_BUILDS_DIR/persist/repos
-    SSTATE_DIR: $CI_BUILDS_DIR/persist/sstate
-    DL_DIR: $CI_BUILDS_DIR/persist/downloads
+    KAS_REPO_REF_DIR: $CACHE_DIR/repos
+    SSTATE_DIR: $CACHE_DIR/sstate
+    DL_DIR: $CACHE_DIR/downloads
     BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
-    TOOLCHAIN_DIR: $CI_BUILDS_DIR/persist/toolchains
+    TOOLCHAIN_DIR: $CACHE_DIR/toolchains
     IMAGE_DIR: $CI_PROJECT_DIR/work/build/tmp/deploy/images
     TOOLCHAIN_LINK_DIR: $CI_PROJECT_DIR/work/build/toolchains
   before_script: