[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/8] scripts/ci/setup: Add Fedora to build-environment.yml
From: |
Lucas Mateus Castro(alqotel) |
Subject: |
[PATCH 6/8] scripts/ci/setup: Add Fedora to build-environment.yml |
Date: |
Wed, 27 Jul 2022 13:36:30 -0300 |
Minicloud doesn't have a RHEL image, but it does have Fedora 34 and 35
images and both use DNF as package manager, so just change the ansible facts
to check if it's RHEL or Fedora
Signed-off-by: Lucas Mateus Castro(alqotel) <lucas.araujo@eldorado.org.br>
---
scripts/ci/setup/build-environment.yml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/ci/setup/build-environment.yml
b/scripts/ci/setup/build-environment.yml
index 43cf8c759f..a7d53d0f70 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -165,8 +165,10 @@
- zlib-devel
state: present
when:
- - ansible_facts['distribution_file_variety'] == 'RedHat'
- - ansible_facts['distribution_version'] == '8'
+ - |
+ (ansible_facts['distribution'] == 'RedHat' and
+ ansible_facts['distribution_version'] == '8') or
+ ansible_facts['distribution'] == 'Fedora'
- name: Install packages only available on x86 and aarch64
dnf:
@@ -175,6 +177,8 @@
- spice-server
state: present
when:
- - ansible_facts['distribution_file_variety'] == 'RedHat'
- - ansible_facts['distribution_version'] == '8'
+ - |
+ (ansible_facts['distribution'] == 'RedHat' and
+ ansible_facts['distribution_version'] == '8') or
+ ansible_facts['distribution'] == 'Fedora'
- ansible_facts['architecture'] == 'aarch64' or
ansible_facts['architecture'] == 'x86_64'
--
2.25.1
- [PATCH 0/8] Patch series to set up a ppc64le CI, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 3/8] scripts/ci/setup: Fix libxen requirements, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 1/8] tests/docker: Fix alpine dockerfile, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 2/8] scripts/ci/setup: ninja missing from build-environment, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 5/8] scripts/ci/setup: Add ppc64le to vars.yml template, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 6/8] scripts/ci/setup: Add Fedora to build-environment.yml,
Lucas Mateus Castro(alqotel) <=
- [PATCH 4/8] scripts/ci/setup: spice-server only on x86 aarch64, Lucas Mateus Castro(alqotel), 2022/07/27
- [PATCH 7/8] scripts/ci/setup: Added debian to build-environment.yml, Lucas Mateus Castro(alqotel), 2022/07/27
- [RFC PATCH 8/8] tests/docker: Selective line reading by python script, Lucas Mateus Castro(alqotel), 2022/07/27