scripts/ci: Consolidate Ansible playbook rules

[RFC PATCH 3/9] scripts/ci: Split EL8 specific packages out of Centos8 list

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 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 32ac0a74f4..60b751018f 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -234,10 +234,8 @@
           - nmap-ncat
           - numactl-devel
           - pixman-devel
-          - python38
           - python3-sphinx
           - rdma-core-devel
-          - redhat-rpm-config
           - snappy-devel
           - spice-glib-devel
           - systemd-devel
@@ -249,6 +247,16 @@
         - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
         - ansible_facts['distribution_version'] == '8'
 
+    - name: Install packages only available on EL8
+      dnf:
+        name:
+          - python38
+          - redhat-rpm-config
+        state: present
+      when:
+        - ansible_facts['distribution_file_variety'] in ['RedHat']
+        - ansible_facts['distribution_version'] == '8'
+
     - name: Install Spice packages
       dnf:
         # Spice server not available in ppc64le
-- 
2.41.0