summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2021-10-05 13:58:46 -0700
committerRichard Henderson <richard.henderson@linaro.org>2021-10-05 16:40:39 -0700
commite3acc2c1961cbe22ca474cd5da4163b7bbf7cea3 (patch)
tree92db1d882954b685ad6041d4c040f1cfe661a21f
parent274f9a381cd334118e9c84afb3285fe1da97cf87 (diff)
downloadfocaccia-qemu-e3acc2c1961cbe22ca474cd5da4163b7bbf7cea3.tar.gz
focaccia-qemu-e3acc2c1961cbe22ca474cd5da4163b7bbf7cea3.zip
tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
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.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20211005205846.153724-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--tests/docker/dockerfiles/fedora-i386-cross.docker6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index dbb8195eb1..84f2697b6c 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 \
@@ -19,10 +20,11 @@ ENV PACKAGES \
     nettle-devel.i686 \
     perl-Test-Harness \
     pixman-devel.i686 \
+    sysprof-capture-devel.i686 \
     zlib-devel.i686
 
 ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
 ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
 
-RUN dnf install -y $PACKAGES
+RUN dnf update -y && dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt