[PATCH v2 0/4] Patch series to set up a ppc64le CI

[PATCH v2 0/4] Patch series to set up a ppc64le CI

[Lucas Mateus Castro(alqotel)]

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

This patch series aim to make easier to set up a compilation and CI
environment on PPC64 and PPC64LE machines.

v2:
This patch series are only patches 2-4 of v1 and an alternative to patch 1
suggested by Daniel.

Lucas Mateus Castro (alqotel) (4):
  scripts/ci/setup: ninja missing from build-environment
  scripts/ci/setup: Fix libxen requirements
  scripts/ci/setup: spice-server only on x86 aarch64
  tests/docker: run script use realpath instead of readlink

 scripts/ci/setup/build-environment.yml | 15 +++++++++++++--
 tests/docker/run                       |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

-- 
2.31.1

[PATCH v2 1/4] scripts/ci/setup: ninja missing from build-environment

[Lucas Mateus Castro(alqotel)]

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

ninja-build is missing from the RHEL environment, so a system prepared
with that script would still fail to compile QEMU.
Tested on a Fedora 36

Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
---
 scripts/ci/setup/build-environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 232525b91d..6df3e61d94 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -150,6 +150,7 @@
           - libepoxy-devel
           - libgcrypt-devel
           - lzo-devel
+          - ninja-build
           - make
           - mesa-libEGL-devel
           - nettle-devel
-- 
2.31.1

Re: [PATCH v2 1/4] scripts/ci/setup: ninja missing from build-environment

[Thomas Huth]

On 14/09/2022 13.41, Lucas Mateus Castro(alqotel) wrote:
> From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>
> 
> ninja-build is missing from the RHEL environment, so a system prepared
> with that script would still fail to compile QEMU.
> Tested on a Fedora 36
> 
> Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
> ---
>   scripts/ci/setup/build-environment.yml | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
> index 232525b91d..6df3e61d94 100644
> --- a/scripts/ci/setup/build-environment.yml
> +++ b/scripts/ci/setup/build-environment.yml
> @@ -150,6 +150,7 @@
>             - libepoxy-devel
>             - libgcrypt-devel
>             - lzo-devel
> +          - ninja-build
>             - make
>             - mesa-libEGL-devel
>             - nettle-devel

Looks like the list used to be sorted alphabetically, so maybe you should 
sort it in some lines later?

And I wonder why this hasn't been noticed before ... Cleber, was this in use 
after all?

  Thomas

Re: [PATCH v2 1/4] scripts/ci/setup: ninja missing from build-environment

[Lucas Mateus Martins Araujo e Castro]

On 15/09/2022 12:54, Thomas Huth wrote:

> On 14/09/2022 13.41, Lucas Mateus Castro(alqotel) wrote:
>> From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>
>>
>> ninja-build is missing from the RHEL environment, so a system prepared
>> with that script would still fail to compile QEMU.
>> Tested on a Fedora 36
>>
>> Signed-off-by: Lucas Mateus Castro (alqotel) 
>> <lucas.araujo@eldorado.org.br>
>> ---
>>   scripts/ci/setup/build-environment.yml | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/scripts/ci/setup/build-environment.yml 
>> b/scripts/ci/setup/build-environment.yml
>> index 232525b91d..6df3e61d94 100644
>> --- a/scripts/ci/setup/build-environment.yml
>> +++ b/scripts/ci/setup/build-environment.yml
>> @@ -150,6 +150,7 @@
>>             - libepoxy-devel
>>             - libgcrypt-devel
>>             - lzo-devel
>> +          - ninja-build
>>             - make
>>             - mesa-libEGL-devel
>>             - nettle-devel
> 
> Looks like the list used to be sorted alphabetically, so maybe you should
> sort it in some lines later?
D'oh, I'll send a v3 fixing that.
> 
> And I wonder why this hasn't been noticed before ... Cleber, was this in 
> use
> after all?
> 
>   Thomas
> 

-- 
Lucas Mateus M. Araujo e Castro
Instituto de Pesquisas ELDORADO
<https://www.eldorado.org.br/?utm_campaign=assinatura_de_e-mail&utm_medium=email&utm_source=RD+Station>
Departamento Computação Embarcada
Analista de Software Junior
Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>

[PATCH v2 2/4] scripts/ci/setup: Fix libxen requirements

[Lucas Mateus Castro(alqotel)]

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

XEN hypervisor is only available in ARM and x86, but the yaml only
checked if the architecture is different from s390x, changed it to
a more accurate test.
Tested this change on a Ubuntu 20.04 ppc64le.

Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
 scripts/ci/setup/build-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 6df3e61d94..7535228685 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -97,7 +97,7 @@
         state: present
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['architecture'] != 's390x'
+        - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
 
     - name: Install basic packages to build QEMU on Ubuntu 20.04
       package:
-- 
2.31.1

Re: [PATCH v2 2/4] scripts/ci/setup: Fix libxen requirements

[Philippe Mathieu-Daudé via]

On 14/9/22 14:41, Lucas Mateus Castro(alqotel) wrote:
> From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>
> 
> XEN hypervisor is only available in ARM and x86, but the yaml only
> checked if the architecture is different from s390x, changed it to
> a more accurate test.
> Tested this change on a Ubuntu 20.04 ppc64le.
> 
> Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   scripts/ci/setup/build-environment.yml | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
> index 6df3e61d94..7535228685 100644
> --- a/scripts/ci/setup/build-environment.yml
> +++ b/scripts/ci/setup/build-environment.yml
> @@ -97,7 +97,7 @@
>           state: present
>         when:
>           - ansible_facts['distribution'] == 'Ubuntu'
> -        - ansible_facts['architecture'] != 's390x'
> +        - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
>   
>       - name: Install basic packages to build QEMU on Ubuntu 20.04
>         package:

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

[PATCH v2 3/4] scripts/ci/setup: spice-server only on x86 aarch64

[Lucas Mateus Castro(alqotel)]

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

Changed build-environment.yml to only install spice-server on x86_64 and
aarch64 as this package is only available on those architectures.

Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
---
 scripts/ci/setup/build-environment.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index 7535228685..43cf8c759f 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -160,7 +160,6 @@
           - python36
           - rdma-core-devel
           - spice-glib-devel
-          - spice-server
           - systemtap-sdt-devel
           - tar
           - zlib-devel
@@ -168,3 +167,14 @@
       when:
         - ansible_facts['distribution_file_variety'] == 'RedHat'
         - ansible_facts['distribution_version'] == '8'
+
+    - name: Install packages only available on x86 and aarch64
+      dnf:
+        # Spice server not available in ppc64le
+        name:
+          - spice-server
+        state: present
+      when:
+        - ansible_facts['distribution_file_variety'] == 'RedHat'
+        - ansible_facts['distribution_version'] == '8'
+        - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
-- 
2.31.1

Re: [PATCH v2 3/4] scripts/ci/setup: spice-server only on x86 aarch64

[Philippe Mathieu-Daudé via]

On 14/9/22 14:41, Lucas Mateus Castro(alqotel) wrote:
> From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>
> 
> Changed build-environment.yml to only install spice-server on x86_64 and
> aarch64 as this package is only available on those architectures.
> 
> Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
> ---
>   scripts/ci/setup/build-environment.yml | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

[PATCH v2 4/4] tests/docker: run script use realpath instead of readlink

[Lucas Mateus Castro(alqotel)]

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

The alpine docker image only comes with busybox, which doesn't have the
'-e' option on its readlink, so change it to 'realpath' to avoid that
problem.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
---
 tests/docker/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/run b/tests/docker/run
index 421393046b..9eb96129da 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -15,7 +15,7 @@ if test -n "$V"; then
     set -x
 fi
 
-BASE="$(dirname $(readlink -e $0))"
+BASE="$(dirname $(realpath $0))"
 
 # Prepare the environment
 export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
-- 
2.31.1