On Wed, Sep 09, 2020 at 03:48:18AM +0800, Yonggang Luo wrote:
> freebsd 1 hour limit not hit anymore
How long does the combined job take with this change ? If it is
within 10 minutes of the limit, then we still want the split, as
transient changes in the CI system can push it over the limit
making the test unreliable.
>
> Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
> ---
> .cirrus.yml | 35 ++++++++---------------------------
> 1 file changed, 8 insertions(+), 27 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 49335e68c9..b0004273bb 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.28.0.windows.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
