cirrus: Building freebsd in a single shot

This reverts commit 45f7b7b9f3
("cirrus.yml: Split FreeBSD job into two parts").

freebsd 1 hour limit not hit anymore

I think we going to a wrong direction, I think there is some tests a stall the test runner,
please look at
https://cirrus-ci.com/task/5110577531977728
When its running properly, the consumed time are little, but when tests running too long,
look at the cpu usage, the cpu usage are nearly zero. doesn't consuming time.

And look at
https://cirrus-ci.com/task/6119341601062912

If the tests running properly, the time consuming are little
We should not hide the error by split them

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Ed Maste <emaste@FreeBSD.org>
Message-Id: <20200915121318.247-16-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Yonggang Luo 2020-09-15 20:13:07 +08:00 committed by Thomas Huth
parent b1788880ba
commit 114daec31d

View file

@ -1,38 +1,19 @@
env:
CIRRUS_CLONE_DEPTH: 1
freebsd_1st_task:
freebsd_12_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 gsed
nettle perl5 pixman pkgconf png usbredir
cpu: 8
memory: 8G
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 --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; }
- ../configure --enable-werror || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake -j$(sysctl -n hw.ncpu) check