All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Lucas Mateus Castro(alqotel)" <lucas.araujo@eldorado.org.br>
To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: "Lucas Mateus Castro(alqotel)" <lucas.araujo@eldorado.org.br>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <willianr@redhat.com>
Subject: [PATCH 6/8] scripts/ci/setup: Add Fedora to build-environment.yml
Date: Wed, 27 Jul 2022 13:36:30 -0300	[thread overview]
Message-ID: <20220727163632.59806-7-lucas.araujo@eldorado.org.br> (raw)
In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br>

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



  parent reply	other threads:[~2022-07-27 17:03 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-27 16:36 [PATCH 0/8] Patch series to set up a ppc64le CI Lucas Mateus Castro(alqotel)
2022-07-27 16:36 ` [PATCH 1/8] tests/docker: Fix alpine dockerfile Lucas Mateus Castro(alqotel)
2022-07-27 17:09   ` Daniel P. Berrangé
2022-07-27 17:23     ` Lucas Mateus Martins Araujo e Castro
2022-07-28  6:52   ` Thomas Huth
2022-07-28  7:06     ` Thomas Huth
2022-07-27 16:36 ` [PATCH 2/8] scripts/ci/setup: ninja missing from build-environment Lucas Mateus Castro(alqotel)
2022-07-27 16:36 ` [PATCH 3/8] scripts/ci/setup: Fix libxen requirements Lucas Mateus Castro(alqotel)
2022-09-07 17:24   ` Alex Bennée
2022-07-27 16:36 ` [PATCH 4/8] scripts/ci/setup: spice-server only on x86 aarch64 Lucas Mateus Castro(alqotel)
2022-07-27 16:36 ` [PATCH 5/8] scripts/ci/setup: Add ppc64le to vars.yml template Lucas Mateus Castro(alqotel)
2022-07-27 16:36 ` Lucas Mateus Castro(alqotel) [this message]
2022-07-27 16:36 ` [PATCH 7/8] scripts/ci/setup: Added debian to build-environment.yml Lucas Mateus Castro(alqotel)
2022-07-27 16:36 ` [RFC PATCH 8/8] tests/docker: Selective line reading by python script Lucas Mateus Castro(alqotel)
2022-07-27 21:20   ` Philippe Mathieu-Daudé via
2022-07-28  8:43     ` Daniel P. Berrangé
2022-09-06 19:52 ` [PATCH 0/8] Patch series to set up a ppc64le CI Daniel Henrique Barboza
2022-09-12 12:16   ` Lucas Mateus Martins Araujo e Castro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220727163632.59806-7-lucas.araujo@eldorado.org.br \
    --to=lucas.araujo@eldorado.org.br \
    --cc=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=willianr@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.