[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] gitlab: skip many more targets in windows cross builds
From: |
Thomas Huth |
Subject: |
[PULL 02/11] gitlab: skip many more targets in windows cross builds |
Date: |
Sat, 14 Aug 2021 08:09:47 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
The windows cross builds still take way too long in gitlab CI, so need
more targets to be skipped. We don't want to hurt coverage of other
cross builds more though, so we let jobs fine tune with a new env
variale $CROSS_SKIP_TARGETS.
We take the set of targets that are considered relatively niche or
very old architectures, and skip approx half of them in win32 builds
and the other half of them in win64.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210810140653.3969823-3-berrange@redhat.com>
[thuth: Swapped the "CROSS_SKIP_TARGETS:" lines as suggested by philmd]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/crossbuild-template.yml | 2 +-
.gitlab-ci.d/crossbuilds.yml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
index cfb576b54c..10d22dcf6c 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -10,7 +10,7 @@
--disable-user --target-list-exclude="arm-softmmu cris-softmmu
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
- sparc-softmmu xtensa-softmmu"
+ sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
- if grep -q "EXESUF=.exe" config-host.mak;
then make installer;
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 4ff3aa3cfc..f10168db2e 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -160,6 +160,8 @@ cross-win32-system:
job: win32-fedora-cross-container
variables:
IMAGE: fedora-win32-cross
+ CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
+ microblazeel-softmmu mips64el-softmmu nios2-softmmu
artifacts:
paths:
- build/qemu-setup*.exe
@@ -170,6 +172,8 @@ cross-win64-system:
job: win64-fedora-cross-container
variables:
IMAGE: fedora-win64-cross
+ CROSS_SKIP_TARGETS: or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu
+ tricore-softmmu xtensaeb-softmmu
artifacts:
paths:
- build/qemu-setup*.exe
--
2.27.0
- [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4, Thomas Huth, 2021/08/14
- [PULL 01/11] gitlab: exclude sparc-softmmu and riscv32-softmmu from cross builds, Thomas Huth, 2021/08/14
- [PULL 05/11] fuzz: avoid building twice, when running on gitlab, Thomas Huth, 2021/08/14
- [PULL 02/11] gitlab: skip many more targets in windows cross builds,
Thomas Huth <=
- [PULL 04/11] tests/qtest/vhost-user-blk-test: Check whether qemu-storage-daemon is available, Thomas Huth, 2021/08/14
- [PULL 03/11] storage-daemon: Add missing build dependency to the vhost-user-blk-test, Thomas Huth, 2021/08/14
- [PULL 09/11] docs/about/removed-features: Document removed HMP commands from QEMU v2.12, Thomas Huth, 2021/08/14
- [PULL 06/11] docs/about/removed-features: Document removed CLI options from QEMU v2.12, Thomas Huth, 2021/08/14
- [PULL 07/11] docs/about/removed-features: Document removed CLI options from QEMU v3.0, Thomas Huth, 2021/08/14
- [PULL 08/11] docs/about/removed-features: Document removed CLI options from QEMU v3.1, Thomas Huth, 2021/08/14
- [PULL 10/11] docs/about/removed-features: Document removed devices from older QEMU versions, Thomas Huth, 2021/08/14
- [PULL 11/11] docs/about/removed-features: Document removed machines from older QEMU versions, Thomas Huth, 2021/08/14
- Re: [PULL 00/11] Optional gitlab-CI and doc fixes for -rc4, Peter Maydell, 2021/08/16