From fcb78295f7553649659ced510d333070de4d16de Mon Sep 17 00:00:00 2001 From: castrojo Date: Fri, 13 Nov 2026 20:27:51 -0500 Subject: [PATCH] fix(cache): seed brew-nspawn to CAS and prioritize Bluefin remote Add fsdk-containers.bst:oci/brew-nspawn.bst to ELEMENTS in scripts/kernel-cache.sh so release and dev seeders push the key-free brew machine and its dependency tree to cache.projectbluefin.io:11002. Reorder artifacts and source-caches in project.conf to query the project CAS remote first before upstream mirrors. Assisted-by: GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: castrojo --- project.conf | 8 ++++---- scripts/kernel-cache.sh | 2 +- tests/unit/test_kernel_cache.py | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/project.conf b/project.conf index 17207e8b..17000ce3 100644 --- a/project.conf +++ b/project.conf @@ -52,13 +52,13 @@ variables: # Pull-only: read from the shared GNOME + Bluefin BuildStream CAS caches. artifacts: - - url: https://gbm.gnome.org:11003 + - url: https://cache.projectbluefin.io:11001 connection-config: keepalive-time: 180 retry-limit: 5 retry-delay: 500 request-timeout: 180 - - url: https://cache.projectbluefin.io:11001 + - url: https://gbm.gnome.org:11003 connection-config: keepalive-time: 180 retry-limit: 5 @@ -66,13 +66,13 @@ artifacts: request-timeout: 180 source-caches: - - url: https://gbm.gnome.org:11003 + - url: https://cache.projectbluefin.io:11001 connection-config: keepalive-time: 180 retry-limit: 5 retry-delay: 500 request-timeout: 180 - - url: https://cache.projectbluefin.io:11001 + - url: https://gbm.gnome.org:11003 connection-config: keepalive-time: 180 retry-limit: 5 diff --git a/scripts/kernel-cache.sh b/scripts/kernel-cache.sh index 70a2a210..67a2a7cd 100755 --- a/scripts/kernel-cache.sh +++ b/scripts/kernel-cache.sh @@ -36,7 +36,7 @@ # directory's import is pushed with the kernel). set -euo pipefail -ELEMENTS=(freedesktop-sdk.bst:components/linux.bst freedesktop-sdk.bst:components/go.bst) +ELEMENTS=(freedesktop-sdk.bst:components/linux.bst freedesktop-sdk.bst:components/go.bst fsdk-containers.bst:oci/brew-nspawn.bst) KEYS_ELEMENT=bluefin-server/keys/boot-keys.bst PUSH_URL=https://cache.projectbluefin.io:11002 diff --git a/tests/unit/test_kernel_cache.py b/tests/unit/test_kernel_cache.py index 8a44cf03..351cb60a 100644 --- a/tests/unit/test_kernel_cache.py +++ b/tests/unit/test_kernel_cache.py @@ -65,7 +65,7 @@ def env(tmp_path: Path) -> dict[str, str]: "PATH": f"{bin_dir}:{os.environ['PATH']}", "LOG": str(tmp_path / "log"), "GRAPH": "freedesktop-sdk.bst:components/linux.bst bluefin-server/keys/linux-module-cert.bst", - "STATES": " not cached freedesktop-sdk.bst:components/linux.bst\n available freedesktop-sdk.bst:components/go.bst", + "STATES": " not cached freedesktop-sdk.bst:components/linux.bst\n available freedesktop-sdk.bst:components/go.bst\n available fsdk-containers.bst:oci/brew-nspawn.bst", "CASD_CLIENT_CERT": "-----BEGIN CERTIFICATE-----\ncert\n-----END CERTIFICATE-----", "CASD_CLIENT_KEY": "-----BEGIN PRIVATE KEY-----\nkey\n-----END PRIVATE KEY-----", "BST_FLAGS": "", @@ -166,6 +166,7 @@ def test_seed_pushes_with_the_client_certificate(checkout: Path, env: dict[str, "build", "freedesktop-sdk.bst:components/linux.bst", "freedesktop-sdk.bst:components/go.bst", + "fsdk-containers.bst:oci/brew-nspawn.bst", ] conf = (log / "buildstream.conf").read_text() for kind in ("artifacts:", "source-caches:"):