* [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
@ 2021-10-05 20:58 Richard Henderson
2021-10-05 22:16 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Richard Henderson @ 2021-10-05 20:58 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, alex.bennee
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
2021-10-05 20:58 [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34 Richard Henderson
@ 2021-10-05 22:16 ` Paolo Bonzini
2021-10-06 1:25 ` Richard Henderson
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2021-10-05 22:16 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: alex.bennee
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
2021-10-05 22:16 ` Paolo Bonzini
@ 2021-10-06 1:25 ` Richard Henderson
0 siblings, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-10-06 1:25 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
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~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-06 1:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 20:58 [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34 Richard Henderson
2021-10-05 22:16 ` Paolo Bonzini
2021-10-06 1:25 ` Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).