cirrus.yml: Split FreeBSD job into two parts

The FreeBSD jobs currently hit the 1h time limit in the Cirrus-CI.
We have to split the build targets here to make sure that the job
finishes in time again. According to the Cirrus-CI docs and some
tests that I did, it also seems like the total amount of CPUs that
can be used for FreeBSD jobs is limited to 8, so each job now only
gets 4 CPUs. That increases the compilation time of each job a little
bit, but it still seems to be better to run two jobs with 4 CPUs each
in parallel than to run two jobs with 8 CPUs sequentially.

Message-Id: <20200831154405.229706-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2020-08-24 08:25:21 +02:00
parent 7498e6afa1
commit 45f7b7b9f3

View file

@ -1,20 +1,40 @@
env:
CIRRUS_CLONE_DEPTH: 1
freebsd_12_task:
freebsd_1st_task:
freebsd_instance:
image_family: freebsd-12-1
cpu: 8
memory: 8G
cpu: 4
memory: 4G
install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y
bash curl cyrus-sasl git glib gmake gnutls gsed
nettle perl5 pixman pkgconf png usbredir
script:
- mkdir build
- cd build
- ../configure --enable-werror || { cat config.log; exit 1; }
- gmake -j8
- gmake V=1 check
- ../configure --disable-user --target-list-exclude='alpha-softmmu
ppc64-softmmu ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu
sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu'
--enable-werror || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake -j$(sysctl -n hw.ncpu) check
freebsd_2nd_task:
freebsd_instance:
image_family: freebsd-12-1
cpu: 4
memory: 4G
install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y
bash curl cyrus-sasl git glib gmake gnutls gtk3 gsed libepoxy mesa-libs
nettle perl5 pixman pkgconf png SDL2 usbredir
script:
- ./configure --enable-werror --target-list='alpha-softmmu ppc64-softmmu
ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu
sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu
sparc-bsd-user sparc64-bsd-user x86_64-bsd-user i386-bsd-user'
|| { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake -j$(sysctl -n hw.ncpu) check
macos_task:
osx_instance: