From: Denis Ovsienko <denis@ovsienko.info>
Date: Thu, 29 Jul 2021 20:20:00 +0000 (+0100)
Subject: Cirrus CI: Fixup the previous commit. [skip appveyor]
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/00353f9e1ae70b45e68d9025ed58949c9653f677?hp=0a29523dfcab768d665e9336704ddf35e8bd5462

Cirrus CI: Fixup the previous commit. [skip appveyor]

Failed to start an instance: [...]
Number of vCPUs should be multiple of 2 if greater than 2, while 3.0 is
requested. Memory size for 3.0 vCPU instance should be between 2816MiB
and 19968MiB, while 2048MiB is requested.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 5216952d..8867b0b9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,19 +7,20 @@ freebsd_task:
   only_if: $CIRRUS_BRANCH != 'coverity_scan'
   freebsd_instance:
     # FreeBSD fails to start with 1 GB. 8 CPUs max concurrency.
+    # The number of CPU cores must be either 1 or a multiple of 2.
     matrix:
       - image_family: freebsd-11-4
-        cpu: 3
+        cpu: 2
         memory: 2G
       - image_family: freebsd-12-2
-        cpu: 3
+        cpu: 2
         memory: 2G
       - image_family: freebsd-13-0
         cpu: 2
         memory: 2G
   env:
     IGNORE_OSVERSION: yes
-    MAKEFLAGS: -j 4
+    MAKEFLAGS: -j 3
     MATRIX_CC: clang gcc10
   script:
     - pkg install -qy git autoconf gcc10
@@ -35,6 +36,7 @@ linux_task:
   only_if: $CIRRUS_BRANCH != 'coverity_scan'
   container:
     # Linux works just fine with 1 GB. 16 CPUs max concurrency.
+    # The number of CPU cores must be either 1 or a multiple of 2.
     cpu: 4
     memory: 1G
     image: ubuntu:20.04