From b722b38291064166e31a056157db874412c53fec Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Wed, 3 May 2023 14:29:12 +0000 Subject: [PATCH 1/2] Use v1.4.2 version of the templates To ensure the builds work on both kubernetes and docker+machine based infrastructure we need to adopt the new template version the sets the entry points to run or not in a deterministic manner. Changelog: bug Signed-off-by: Drew Reed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d79e62f..00de9ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ variables: # include jobs include: - project: $PIPELINE_TEMPLATE_PROJECT - ref: v1.4.1 + ref: v1.4.2 file: - gitlab-ci/common_gitlab-ci.yml - gitlab-ci/docker-image-base_gitlab-ci.yml -- GitLab From 2895244ff19612d99c8c2377e90044a014eae867 Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Fri, 12 May 2023 09:55:40 +0000 Subject: [PATCH 2/2] Allow setting the sstate-cache location Enable the location of the sstate-cache common volume to be set based on the host infrastructure the build is running on. Signed-off-by: Drew Reed --- .gitlab-ci.yml | 1 + .gitlab/ci/cassini-build.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00de9ca..0eecee4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ --- variables: DOCKER_IMAGE_TAG: $CI_COMMIT_REF_SLUG + CONTAINER_COMMON_MOUNT: /sstate-cache CI_DEBUG_TRACE: value: 'false' description: Enable debug information output to the log diff --git a/.gitlab/ci/cassini-build.yml b/.gitlab/ci/cassini-build.yml index 52a270a..f92cb8b 100644 --- a/.gitlab/ci/cassini-build.yml +++ b/.gitlab/ci/cassini-build.yml @@ -7,7 +7,7 @@ # the Cassini kas container .yocto_base: variables: - CACHE_DIR: /sstate-cache + CACHE_DIR: $CONTAINER_COMMON_MOUNT SSTATE_DIR: $CACHE_DIR/$PROJECT_VERSION/yocto-sstate DL_DIR: $CACHE_DIR/$PROJECT_VERSION/yocto-downloads TOOLCHAIN_DIR: $CACHE_DIR/$PROJECT_VERSION/toolchains -- GitLab