scripts/ci: Consolidate Ansible playbook rules

[RFC PATCH 7/9] scripts/ci: Install RH packages on RH derivative distros

Posted by Philippe Mathieu-Daudé 10 months, 3 weeks ago

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 scripts/ci/setup/build-environment.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 8a6855f472..6baa539b46 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -193,7 +193,7 @@
         - ansible_facts['distribution_file_variety'] == 'CentOS'
         - ansible_facts['distribution_major_version'] == '8'
 
-    - name: Install basic packages to build QEMU on EL8
+    - name: Install basic packages to build QEMU on RH family
       dnf:
         name:
           - SDL2-devel
@@ -303,8 +303,7 @@
           - zlib-static
         state: present
       when:
-        - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
-        - ansible_facts['distribution_version'] == '8'
+        - ansible_facts['os_family'] == 'RedHat'
 
     - name: Install packages only available on EL8
       dnf:
-- 
2.41.0