[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging-4.17] CI: Stop building QEMU in general



commit f27787545c6529c214a61bd99a104ce82bfdf757
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Sat Jul 13 17:50:30 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Nov 12 11:20:45 2024 +0000

    CI: Stop building QEMU in general
    
    We spend an awful lot of CI time building QEMU, even though most changes 
don't
    touch the subset of tools/libs/ used by QEMU.  Some numbers taken at a time
    when CI was otherwise quiet:
    
                           With     Without
      Alpine:              13m38s   6m04s
      Debian 12:           10m05s   8m10s
      OpenSUSE Tumbleweed: 11m40s   7m54s
      Ubuntu 24.04:        14m56s   8m06s
    
    which is a >50% improvement in wallclock time in some cases.
    
    The only build we have that needs QEMU is alpine-3.18-gcc-debug.  This is 
the
    build deployed and used by the QubesOS ADL-* and Zen3p-* jobs.
    
    Xilinx-x86_64 deploys it too, but is PVH-only and doesn't use QEMU.
    
    QEMU is also built by CirrusCI for FreeBSD (fully Clang/LLVM toolchain).
    
    This should help quite a lot with Gitlab CI capacity.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    (cherry picked from commit e305256e69b1c943db3ca20173da6ded3db2d252)
---
 automation/gitlab-ci/build.yaml | 1 +
 automation/scripts/build        | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 33590329b9..1b27e5c01b 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -434,6 +434,7 @@ alpine-3.12-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
     CONTAINER: alpine:3.12
+    BUILD_QEMU_XEN: y
 
 alpine-3.12-clang:
   extends: .clang-x86-64-build
diff --git a/automation/scripts/build b/automation/scripts/build
index 5dafa72ba5..ca444674cc 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -59,9 +59,8 @@ if ! test -z "$(ldd /bin/ls|grep musl|head -1)"; then
     cfgargs+=("--with-system-seabios=/bin/false")
 fi
 
-# Qemu requires Python 3.5 or later, and ninja
-if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 5); 
exit(not(res))" \
-        || ! type ninja; then
+# QEMU is only for those who ask
+if [[ "$BUILD_QEMU_XEN" != "y" ]]; then
     cfgargs+=("--with-system-qemu=/bin/false")
 fi
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.17



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.