From abebe0921fa38ae1cb018f88ebaa3fa2efbab0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 22 Jul 2026 13:37:27 +0200 Subject: [PATCH] ci: profiles: split feed pins into per-feed files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keep feed pin changes isolated so diff-based CRAM selection can map each feed update to the component it affects. Move the three prpl_core feed entries into dedicated profile files and include them from prpl_core. Preserve each feed entry byte-for-byte. Run scripts/gen_config.py for all nine build-test profile argument sets at the base pin and after the split. The offline harness allowed local feed setup while suppressing network update/install and make subprocesses. All 27 generated stdout, .config, and feeds.conf artifacts were identical. Assisted-by: codex:gpt-5.6-sol References: CI-9 Signed-off-by: Petr Štetiar --- .gitlab/tests/cram/README.md | 9 +++++++++ profiles/feed_amx.yml | 5 +++++ profiles/feed_prplmesh.yml | 5 +++++ profiles/feed_prplos.yml | 5 +++++ profiles/prpl_core.yml | 16 ++++------------ 5 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 profiles/feed_amx.yml create mode 100644 profiles/feed_prplmesh.yml create mode 100644 profiles/feed_prplos.yml diff --git a/.gitlab/tests/cram/README.md b/.gitlab/tests/cram/README.md index 0f61e15890..02bc37ae22 100644 --- a/.gitlab/tests/cram/README.md +++ b/.gitlab/tests/cram/README.md @@ -55,6 +55,15 @@ The `smoke` and `hw_only` sets are reserved for the upcoming QEMU testbed lane excluded from the QEMU candidate set. The lint validates both sets; hardware jobs do not use them. +## Feed pin layout + +The `feed_amx`, `feed_prplmesh`, and `feed_prplos` pins live in +`profiles/feed_amx.yml`, `profiles/feed_prplmesh.yml`, and +`profiles/feed_prplos.yml`. `profiles/prpl_core.yml` includes those profiles, +so builds still receive the same feeds while a feed-only bump has its own +changed path. Keep each feed pin in its dedicated profile; the selection matrix +uses those paths to distinguish full, prplMesh, and prplOS coverage. + ## Scripts - `cram_component_bucketing.py` provides the shared manifest, collection, glob diff --git a/profiles/feed_amx.yml b/profiles/feed_amx.yml new file mode 100644 index 0000000000..b720e3ea27 --- /dev/null +++ b/profiles/feed_amx.yml @@ -0,0 +1,5 @@ +--- +feeds: + - name: feed_amx + uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed_amx.git + revision: main@077495621990fcdf2e2fbc277ccd508391ee3975 diff --git a/profiles/feed_prplmesh.yml b/profiles/feed_prplmesh.yml new file mode 100644 index 0000000000..16aed510e0 --- /dev/null +++ b/profiles/feed_prplmesh.yml @@ -0,0 +1,5 @@ +--- +feeds: + - name: feed_prplmesh + uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplmesh.git + revision: main@af298bb28afbc83168b9217eec17d6099b80a0b7 diff --git a/profiles/feed_prplos.yml b/profiles/feed_prplos.yml new file mode 100644 index 0000000000..23e9fa9040 --- /dev/null +++ b/profiles/feed_prplos.yml @@ -0,0 +1,5 @@ +--- +feeds: + - name: feed_prplos + uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git + revision: main@5887d447a41a38bdb306602e73ba04b0b1d14501 diff --git a/profiles/prpl_core.yml b/profiles/prpl_core.yml index 15f75c5bb1..b01ad93cca 100644 --- a/profiles/prpl_core.yml +++ b/profiles/prpl_core.yml @@ -1,17 +1,9 @@ --- description: A minimal set of prpl packages and configs (no WAN support, no LCM, no management) common to prpl device classes (Gateway, Extender, ...) -feeds: - - name: feed_amx - uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed_amx.git - revision: main@077495621990fcdf2e2fbc277ccd508391ee3975 - - - name: feed_prplmesh - uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplmesh.git - revision: main@af298bb28afbc83168b9217eec17d6099b80a0b7 - - - name: feed_prplos - uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git - revision: main@5887d447a41a38bdb306602e73ba04b0b1d14501 +include: + - feed_amx + - feed_prplmesh + - feed_prplos additional_packages: - feed: packages