From 8837c68dc1c1a5ca22fc31065d0084ee0a2c1efe Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Thu, 3 Mar 2022 12:18:47 +0100
Subject: [PATCH] .oniro-ci: use CI_ONIRO_RUNNER_PERSISTENT_STORAGE
As defined on https://booting.oniroproject.org/distro/infra/
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.oniro-ci/build-generic.yaml | 17 ++++++++++-------
docs/ci/hidden-jobs/bitbake-workspace.rst | 17 +++++++++--------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 59699e8b..adbe4dbc 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -36,7 +36,7 @@
echo "CI_ONIRO_MANIFEST_NAME: $CI_ONIRO_MANIFEST_NAME"
echo "CI_ONIRO_MANIFEST_BRANCH: $CI_ONIRO_MANIFEST_BRANCH"
repo init --reference \
- /var/shared/pub/git-repo-mirrors/"$CI_ONIRO_MANIFEST_MIRROR" \
+ "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE"/pub/git-repo-mirrors/"$CI_ONIRO_MANIFEST_MIRROR" \
--manifest-url "$CI_ONIRO_MANIFEST_URL" \
--manifest-name "$CI_ONIRO_MANIFEST_NAME" \
--manifest-branch "$CI_ONIRO_MANIFEST_BRANCH"
@@ -83,8 +83,8 @@
CI_ONIRO_BUILD_FLAVOUR: ""
CI_ONIRO_BUILD_CACHE: "private"
CI_ONIRO_BB_LOCAL_CONF_CONNECTIVITY_CHECK_URIS: "https://example.net/"
- CI_ONIRO_BB_LOCAL_CONF_DL_DIR: /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake/downloads
- CI_ONIRO_BB_LOCAL_CONF_SSTATE_DIR: /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache
+ CI_ONIRO_BB_LOCAL_CONF_DL_DIR: $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/downloads
+ CI_ONIRO_BB_LOCAL_CONF_SSTATE_DIR: $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache
CI_ONIRO_BB_LOCAL_CONF_IMAGE_VERSION_SUFFIX: ""
CI_ONIRO_BB_LOCAL_CONF_CVE_CHECK_DB_DIR: "$${TMPDIR}/CVE_CHECK/"
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check
@@ -108,13 +108,16 @@
echo "precondition failed - cannot define just one of CI_ONIRO_DEVTOOL_RECIPE_NAME and CI_ONIRO_DEVTOOL_LAYER_PATH"
exit 1
fi
- # Bitbake is configured to use /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake
+ # Bitbake is configured to use $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake
# directory for both the download directory and the sstate-cache.
- - test -w /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake || (
- echo "precondition failed - expected /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake to be writable"
+ - test -n "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE" || (
+ echo "precondition failed - CI_ONIRO_RUNNER_PERSISTENT_STORAGE is not set"
+ && exit 1 )
+ - test -w "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake" || (
+ echo "precondition failed - expected $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake to be writable"
&& exit 1 )
# Log available disk space on the persistent shared disk.
- - df -h /var/shared/$CI_ONIRO_BUILD_CACHE/bitbake
+ - df -h "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake"
- !reference [.workspace, before_script]
script:
diff --git a/docs/ci/hidden-jobs/bitbake-workspace.rst b/docs/ci/hidden-jobs/bitbake-workspace.rst
index b2dc6730..340f246b 100644
--- a/docs/ci/hidden-jobs/bitbake-workspace.rst
+++ b/docs/ci/hidden-jobs/bitbake-workspace.rst
@@ -125,10 +125,10 @@ than the artifact system, that copies all the data regardless of the need to
actually use that data in practice.
The default location is changed to
-``/var/shared/$CI_ONIRO_BUILD_CACHE/bitbake/downloads``, but this should
-be treated as an implementation detail. The location may change in the future.
-The download cache is not automatically purged yet. In the future it may be
-purged periodically, if space becomes an issue.
+``$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/downloads``,
+but this should be treated as an implementation detail. The location may change
+in the future. The download cache is not automatically purged yet. In the
+future it may be purged periodically, if space becomes an issue.
Note that the location relies on the value of ``$CI_ONIRO_BUILD_CACHE``
discussed above.
@@ -147,10 +147,11 @@ tasks and simply assemble the desired system image out of intermediate files
present in the cache.
The default location is changed to
-``/var/shared/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache``, but this
-should be treated as an implementation detail. The location may change in the
-future. The sstate cache is not automatically purged yet. It can be purged
-periodically with the only caveat, that initial builds will be much slower.
+``$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache``,
+but this should be treated as an implementation detail. The location may change
+in the future. The sstate cache is not automatically purged yet. It can be
+purged periodically with the only caveat, that initial builds will be much
+slower.
Cache Considerations
====================
--
GitLab