[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/24] cirrus: Building freebsd in a single shot
From: |
Thomas Huth |
Subject: |
[PULL 24/24] cirrus: Building freebsd in a single shot |
Date: |
Wed, 16 Sep 2020 13:47:31 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
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 <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>
---
.cirrus.yml | 35 ++++++++---------------------------
1 file changed, 8 insertions(+), 27 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index e5feb53b54..d58782ce67 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
--
2.18.2
- [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows, (continued)
- [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Thomas Huth, 2020/09/16
- [PULL 13/24] tests: test-replication disable /replication/secondary/* on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 16/24] meson: remove empty else and duplicated gio deps, Thomas Huth, 2020/09/16
- [PULL 17/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 19/24] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c, Thomas Huth, 2020/09/16
- [PULL 18/24] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits, Thomas Huth, 2020/09/16
- [PULL 22/24] tests: Fixes test-qdev-global-props.c, Thomas Huth, 2020/09/16
- [PULL 21/24] tests: fix test-util-sockets.c, Thomas Huth, 2020/09/16
- [PULL 23/24] ci: Enable msys2 ci in cirrus, Thomas Huth, 2020/09/16
- [PULL 24/24] cirrus: Building freebsd in a single shot,
Thomas Huth <=
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17