diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-08-10 15:06:53 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-08-11 08:52:31 +0200 |
| commit | a1f0f36838caa8d8dbde4b5be2f889942fb66fd4 (patch) | |
| tree | 37db476b25cf6e224140e1e2c90bad1b731ef921 | |
| parent | a62354915bd5285f338e6c624b146ae5e25b50b4 (diff) | |
| download | focaccia-qemu-a1f0f36838caa8d8dbde4b5be2f889942fb66fd4.tar.gz focaccia-qemu-a1f0f36838caa8d8dbde4b5be2f889942fb66fd4.zip | |
gitlab: skip many more targets in windows cross builds
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>
| -rw-r--r-- | .gitlab-ci.d/crossbuild-template.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.d/crossbuilds.yml | 4 |
2 files changed, 5 insertions, 1 deletions
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 |