Re: [PATCH 03/35] scripts/ci: move build-environment.yaml up a level

[Manos Pitsidianakis <manos.pitsidianakis@linaro.org>]

On Mon, 27 Oct 2025 13:03, Alex Bennée <alex.bennee@linaro.org> wrote:
>We can share the setup of the build environment with multiple
>operating systems as we just need to check the YAML for each env is
>present in the directory structure.
>
>Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

> .../ci/setup/{ubuntu => }/build-environment.yml  | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
> rename scripts/ci/setup/{ubuntu => }/build-environment.yml (81%)
>
>diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/build-environment.yml
>similarity index 81%
>rename from scripts/ci/setup/ubuntu/build-environment.yml
>rename to scripts/ci/setup/build-environment.yml
>index 1c517c74f74..66bde188755 100644
>--- a/scripts/ci/setup/ubuntu/build-environment.yml
>+++ b/scripts/ci/setup/build-environment.yml
>@@ -27,18 +27,24 @@
>         - ansible_facts['distribution'] == 'Ubuntu'
> 
>     # the package lists are updated by "make lcitool-refresh"
>-    - name: Include package lists based on OS and architecture
>-      include_vars:
>-        file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml"
>+    - name: Define package list file path
>+      set_fact:
>+        package_file: "ubuntu/ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml"
>       when:
>         - ansible_facts['distribution'] == 'Ubuntu'
>         - ansible_facts['distribution_version'] == '24.04'
> 
>+    - name: Include package lists based on OS and architecture
>+      include_vars:
>+        file: "{{ package_file }}"
>+      when:
>+        - package_file is exists
>+
>     - name: Install packages for QEMU on Ubuntu 24.04
>       package:
>         name: "{{ packages }}"
>       when:
>-        - ansible_facts['distribution'] == 'Ubuntu'
>-        - ansible_facts['distribution_version'] == '24.04'
>+        - package_file is exists
>+        - packages is defined
> 
> 
>-- 
>2.47.3
>
>