Cirrus CI: Tweak FreeBSD and Linux as in tcpdump. [skip appveyor] [skip travis]

(cherry picked from commit 0e9c25dbafa59db60fb3068271a5d78339d06813)

diff --git a/.cirrus.yml b/.cirrus.yml
index a59a289d0ff2511fa62c27c71478871cae736614..3665a8e85538bd9e0a1a0e509a5fd9e9f31a90dd 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,17 +1,23 @@
 # The internal git client reads CIRRUS_CLONE_DEPTH.
 env:
   CIRRUS_CLONE_DEPTH: 3
 # The internal git client reads CIRRUS_CLONE_DEPTH.
 env:
   CIRRUS_CLONE_DEPTH: 3

-  MAKEFLAGS: '-j 2'

 
 freebsd_task:
   name: FBSD+BM
   freebsd_instance:
     matrix:
       - image_family: freebsd-11-4
 
 freebsd_task:
   name: FBSD+BM
   freebsd_instance:
     matrix:
       - image_family: freebsd-11-4

+        cpu: 2
+        memory: 2G

       - image_family: freebsd-12-2
       - image_family: freebsd-12-2

+        cpu: 2
+        memory: 2G

       - image_family: freebsd-13-0-snap
       - image_family: freebsd-13-0-snap

+        cpu: 4
+        memory: 4G

   env:
     IGNORE_OSVERSION: yes
   env:
     IGNORE_OSVERSION: yes

+    MAKEFLAGS: -j 4

     MATRIX_CC: clang gcc48 gcc10
   script:
     - freebsd-version
     MATRIX_CC: clang gcc48 gcc10
   script:
     - freebsd-version


@@ -23,8 +29,11 @@ linux_task:
   name: LNX+BM
   container:
     image: ubuntu:20.04
   name: LNX+BM
   container:
     image: ubuntu:20.04

+    cpu: 2
+    memory: 1G

   env:
     DEBIAN_FRONTEND: noninteractive # libnids-dev -> tzdata -> debconf
   env:
     DEBIAN_FRONTEND: noninteractive # libnids-dev -> tzdata -> debconf

+    MAKEFLAGS: -j 3

   script:
     - apt-get -qy update
     - apt-get -qy install libdbus-1-dev libbluetooth-dev libnl-genl-3-dev libibverbs-dev
   script:
     - apt-get -qy update
     - apt-get -qy install libdbus-1-dev libbluetooth-dev libnl-genl-3-dev libibverbs-dev