From af229fc367021e361cebaf84acceb01f28922cc4 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Wed, 6 Jan 2021 11:41:59 +0000 Subject: cirrus: don't run full qtest on macOS The Cirrus CI macOS build hosts have exhibited a serious performance degradation in recent months. For example the "qom-test" qtest takes over an hour for only the qemu-system-aarch64 binary. This is as much 20-40 times slower than other environments. The other qtests all show similar performance degradation, as do many of the unit tests. This does not appear related to QEMU code changes, since older git commits which were known to fully complete in less than 1 hour on Cirrus CI now also show similar bad performance. Either Cirrus CI performance has degraded, or an change in its environment has exposed a latent bug widely affecting all of QEMU. Debugging the qom-test showed no easily identified large bottleneck - every step of the test execution was simply slower. macOS builds/tests run outside Cirrus CI show normal performance. With an inability to identify any obvious problem, the only viable way to get a reliably completing Cirrus CI macOS job is to cut out almost all of the qtests. We choose to run the x86_64 target only, since that has very few machine types and thus is least badly impacted in the qom-test execution. With this change, the macOS jobs complete in approx 35 minutes. Signed-off-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210106114159.981538-1-berrange@redhat.com> Signed-off-by: Alex Bennée --- .cirrus.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 62a9b57530..3907e036da 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,7 +18,6 @@ freebsd_12_task: - gmake -j$(sysctl -n hw.ncpu) check V=1 macos_task: - timeout_in: 90m osx_instance: image: catalina-base install_script: @@ -30,10 +29,13 @@ macos_task: --extra-cflags='-Wno-error=deprecated-declarations' || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check V=1 + - gmake check-unit V=1 + - gmake check-block V=1 + - gmake check-qapi-schema V=1 + - gmake check-softfloat V=1 + - gmake check-qtest-x86_64 V=1 macos_xcode_task: - timeout_in: 90m osx_instance: # this is an alias for the latest Xcode image: catalina-xcode @@ -45,7 +47,11 @@ macos_xcode_task: - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check V=1 + - gmake check-unit V=1 + - gmake check-block V=1 + - gmake check-qapi-schema V=1 + - gmake check-softfloat V=1 + - gmake check-qtest-x86_64 V=1 windows_msys2_task: timeout_in: 90m -- cgit v1.2.3-55-g7522