[PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34

[PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34

[Richard Henderson]

For unknown and unrepeatable reasons, the cross-i386-tci test has
started failing.  "Fix" this by updating the container to use fedora 34.

Add sysprof-capture-devel as a new dependency of glib2-devel that
was not correctly spelled out in the rpm rules.

Use dnf update Just In Case -- there are presently out-of-date
packages in the upstream docker registry.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tests/docker/dockerfiles/fedora-i386-cross.docker | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 820740d5be..f62a71ce22 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,4 +1,5 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
+
 ENV PACKAGES \
     bzip2 \
     ccache \
@@ -20,10 +21,11 @@ ENV PACKAGES \
     pcre-devel.i686 \
     perl-Test-Harness \
     pixman-devel.i686 \
+    sysprof-capture-devel.i686 \
     zlib-devel.i686
 
 ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
 ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
 
-RUN dnf install -y $PACKAGES
+RUN dnf update -y && dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.25.1

Re: [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34

[Paolo Bonzini]

On 05/10/21 22:58, Richard Henderson wrote:
> For unknown and unrepeatable reasons, the cross-i386-tci test has
> started failing.  "Fix" this by updating the container to use fedora 34.
> 
> Add sysprof-capture-devel as a new dependency of glib2-devel that
> was not correctly spelled out in the rpm rules.
> 
> Use dnf update Just In Case -- there are presently out-of-date
> packages in the upstream docker registry.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tests/docker/dockerfiles/fedora-i386-cross.docker | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
> index 820740d5be..f62a71ce22 100644
> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
> @@ -1,4 +1,5 @@
> -FROM registry.fedoraproject.org/fedora:33
> +FROM registry.fedoraproject.org/fedora:34
> +
>   ENV PACKAGES \
>       bzip2 \
>       ccache \
> @@ -20,10 +21,11 @@ ENV PACKAGES \
>       pcre-devel.i686 \
>       perl-Test-Harness \
>       pixman-devel.i686 \
> +    sysprof-capture-devel.i686 \
>       zlib-devel.i686
>   
>   ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
>   ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
>   
> -RUN dnf install -y $PACKAGES
> +RUN dnf update -y && dnf install -y $PACKAGES
>   RUN rpm -q $PACKAGES | sort > /packages.txt
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

I would say, go ahead and apply it to the tree directly to unbreak CI.

Paolo

Re: [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34

[Richard Henderson]

On 10/5/21 3:16 PM, Paolo Bonzini wrote:
> On 05/10/21 22:58, Richard Henderson wrote:
>> For unknown and unrepeatable reasons, the cross-i386-tci test has
>> started failing.  "Fix" this by updating the container to use fedora 34.
>>
>> Add sysprof-capture-devel as a new dependency of glib2-devel that
>> was not correctly spelled out in the rpm rules.
>>
>> Use dnf update Just In Case -- there are presently out-of-date
>> packages in the upstream docker registry.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   tests/docker/dockerfiles/fedora-i386-cross.docker | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker 
>> b/tests/docker/dockerfiles/fedora-i386-cross.docker
>> index 820740d5be..f62a71ce22 100644
>> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
>> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
>> @@ -1,4 +1,5 @@
>> -FROM registry.fedoraproject.org/fedora:33
>> +FROM registry.fedoraproject.org/fedora:34
>> +
>>   ENV PACKAGES \
>>       bzip2 \
>>       ccache \
>> @@ -20,10 +21,11 @@ ENV PACKAGES \
>>       pcre-devel.i686 \
>>       perl-Test-Harness \
>>       pixman-devel.i686 \
>> +    sysprof-capture-devel.i686 \
>>       zlib-devel.i686
>>   ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
>>   ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
>> -RUN dnf install -y $PACKAGES
>> +RUN dnf update -y && dnf install -y $PACKAGES
>>   RUN rpm -q $PACKAGES | sort > /packages.txt
>>
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> I would say, go ahead and apply it to the tree directly to unbreak CI.

Done.  CI is now green again.


r~