gitlab-CI: Test 32-bit builds with the fedora-i386-cross container

After adding some missing packages, it's possible to check 32-bit
builds and tests with the fedora-i386-cross container in the gitlab-CI,
too. Unfortunately, the code in subprojects/ ignores the --extra-cflags
(on purpose), so the vhost-user part has to be disabled for this.

While we're at it, update the container to Fedora 31. Unfortunately the
gcc from the later versions emits some very dubious format-truncation
warnings, so Fedora 32 and 33 are currently unsuitable for this job.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201215083451.92322-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Thomas Huth 2020-12-15 09:34:51 +01:00 committed by Paolo Bonzini
parent 2af43a6a59
commit ee381b7fe1
2 changed files with 29 additions and 5 deletions

View File

@ -10,7 +10,7 @@
--target-list-exclude="arm-softmmu cris-softmmu i386-softmmu --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu
ppc-softmmu sh4-softmmu xtensa-softmmu" ppc-softmmu sh4-softmmu xtensa-softmmu"
- make -j$(expr $(nproc) + 1) all check-build - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
# Job to cross-build specific accelerators. # Job to cross-build specific accelerators.
# #
@ -37,7 +37,7 @@
- cd build - cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system
- make -j$(expr $(nproc) + 1) all check-build - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
cross-armel-system: cross-armel-system:
extends: .cross_system_build_job extends: .cross_system_build_job
@ -69,6 +69,18 @@ cross-arm64-user:
variables: variables:
IMAGE: debian-arm64-cross IMAGE: debian-arm64-cross
cross-i386-system:
extends: .cross_system_build_job
variables:
IMAGE: fedora-i386-cross
MAKE_CHECK_ARGS: check-qtest
cross-i386-user:
extends: .cross_user_build_job
variables:
IMAGE: fedora-i386-cross
MAKE_CHECK_ARGS: check
cross-mips-system: cross-mips-system:
extends: .cross_system_build_job extends: .cross_system_build_job
variables: variables:

View File

@ -1,14 +1,26 @@
FROM fedora:30 FROM fedora:31
ENV PACKAGES \ ENV PACKAGES \
bzip2 \
diffutils \
findutils \
gcc \ gcc \
git \
libtasn1-devel.i686 \
libzstd-devel.i686 \
make \
meson \
ninja-build \
glib2-devel.i686 \ glib2-devel.i686 \
glibc-devel.i686 \ glibc-devel.i686 \
glibc-static.i686 \ glibc-static.i686 \
gnutls-devel.i686 \ gnutls-devel.i686 \
nettle-devel.i686 \ nettle-devel.i686 \
perl-Test-Harness \
pixman-devel.i686 \ pixman-devel.i686 \
zlib-devel.i686 \ zlib-devel.i686
libzstd-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 install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt RUN rpm -q $PACKAGES | sort > /packages.txt