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

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

[Peter Hoyes]

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(-)

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:
-- 
2.34.1

[PATCH 2/2] CI: Collect testimage logs on failure

[Peter Hoyes]

From: Peter Hoyes <Peter.Hoyes@arm.com>

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a286900..4471cf30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,7 @@ stages:
     when: on_failure
     paths:
       - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.*
+      - $CI_PROJECT_DIR/work/build/tmp/work*/**/testimage/*
 
 #
 # Prep stage, update repositories once
-- 
2.34.1

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

[Jon Mason]

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,
-- 
Jon Mason <jon.mason@arm.com>