[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross co
From: |
Alex Bennée |
Subject: |
[PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container |
Date: |
Wed, 16 Dec 2020 16:48:25 +0000 |
From: Thomas Huth <thuth@redhat.com>
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>
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index fcc1b95290..66547b6683 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -10,7 +10,7 @@
--target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
microblaze-softmmu mips-softmmu mipsel-softmmu mips64-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.
#
@@ -37,7 +37,7 @@
- cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../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:
extends: .cross_system_build_job
@@ -69,6 +69,18 @@ cross-arm64-user:
variables:
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:
extends: .cross_system_build_job
variables:
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker
b/tests/docker/dockerfiles/fedora-i386-cross.docker
index cd16cd1bfa..a6e411291b 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,14 +1,26 @@
-FROM fedora:30
+FROM fedora:31
ENV PACKAGES \
+ bzip2 \
+ diffutils \
+ findutils \
gcc \
+ git \
+ libtasn1-devel.i686 \
+ libzstd-devel.i686 \
+ make \
+ meson \
+ ninja-build \
glib2-devel.i686 \
glibc-devel.i686 \
glibc-static.i686 \
gnutls-devel.i686 \
nettle-devel.i686 \
+ perl-Test-Harness \
pixman-devel.i686 \
- zlib-devel.i686 \
- libzstd-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 rpm -q $PACKAGES | sort > /packages.txt
--
2.20.1
- [PULL 00/11] testing and configure updates, Alex Bennée, 2020/12/16
- [PULL 01/11] configure: include moxie-softmmu in deprecated_targets_list, Alex Bennée, 2020/12/16
- [PULL 02/11] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build, Alex Bennée, 2020/12/16
- [PULL 03/11] configure: move gettext detection to meson.build, Alex Bennée, 2020/12/16
- [PULL 04/11] configure: add --without-default-features, Alex Bennée, 2020/12/16
- [PULL 05/11] python: add __repr__ to ConsoleSocket to aid debugging, Alex Bennée, 2020/12/16
- [PULL 06/11] gitlab: move --without-default-devices build from Travis, Alex Bennée, 2020/12/16
- [PULL 07/11] gitlab: add --without-default-features build, Alex Bennée, 2020/12/16
- [PULL 08/11] tests/tcg: build tests with -Werror, Alex Bennée, 2020/12/16
- [PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container,
Alex Bennée <=
- [PULL 10/11] tests/docker: Remove the remainders of debian9 containers from the Makefile, Alex Bennée, 2020/12/16
- [PULL 11/11] tests: update for rename of CentOS8 PowerTools repo, Alex Bennée, 2020/12/16
- Re: [PULL 00/11] testing and configure updates, Alex Bennée, 2020/12/16