[PATCH 2/9] scripts/ci: Do not restrict spice package to x86/arm hosts

Philippe Mathieu-Daudé posted 9 patches 10 months, 3 weeks ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
[PATCH 2/9] scripts/ci: Do not restrict spice package to x86/arm hosts
Posted by Philippe Mathieu-Daudé 10 months, 3 weeks ago
Allow installing spice-server-devel package on any non-ppc64le host,
as per commit  556ede028d ("scripts/ci/setup: spice-server only on
x86 aarch64") describes: "Spice server not available in ppc64le".

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

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index f344d1a850..32ac0a74f4 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -249,7 +249,7 @@
         - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
         - ansible_facts['distribution_version'] == '8'
 
-    - name: Install packages only available on x86 and aarch64
+    - name: Install Spice packages
       dnf:
         # Spice server not available in ppc64le
         name:
@@ -257,9 +257,8 @@
           - spice-server-devel
         state: present
       when:
-        - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
-        - ansible_facts['distribution_version'] == '8'
-        - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
+        - ansible_facts['os_family'] == 'RedHat'
+        - ansible_facts['architecture'] != 'ppc64le'
 
     - name: Check whether the Python runtime version is managed by alternatives
       stat:
-- 
2.41.0