Typo "single shot" in subject? On 9/15/20 7:12 PM, Yonggang Luo wrote: > This reverts commit 45f7b7b9f38f5c4d1529a37c93dedfc26a231bba > ("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 <luoyongg...@gmail.com> > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > Reviewed-by: Ed Maste <ema...@freebsd.org> > --- > .cirrus.yml | 35 ++++++++--------------------------- > 1 file changed, 8 insertions(+), 27 deletions(-) > > diff --git a/.cirrus.yml b/.cirrus.yml > index 3dd9fcff7f..25fb4add9b 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -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 > >