From 1e2dd4466c9854e18e8774051c7cb86419f9c330 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 31 Jan 2020 19:16:13 -0800
Subject: [PATCH] Change requested memory in Cirrus CI config

The ASan build does require quite a bit more, but also the default
release builds should do ok with slightly less.
---
 .cirrus.yml | 13 +++++++++----
 CHANGES     |  7 +++++++
 VERSION     |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index b6dd77e461..a421d1e1cb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,6 +1,6 @@
 cpus: &CPUS 8
 btest_jobs: &BTEST_JOBS 8
-memory: &MEMORY 8GB
+memory: &MEMORY 6GB
 
 config: &CONFIG --build-type=release --enable-cpp-tests
 memcheck_config: &MEMCHECK_CONFIG --build-type=debug --enable-cpp-tests --sanitizers=address
@@ -95,10 +95,11 @@ ubuntu16_task:
 macos_task:
   osx_instance:
     image: catalina-base
+    # cpu/memory setting is implicitly 2 core / 4 thread and 8GB, and
+    # trying to set it explicitly results in an error.
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   env:
-    # Currently only available as 2 core / 4 thread (and 8GB) instances.
     ZEEK_CI_CPUS: 4
     ZEEK_CI_BTEST_JOBS: 4
     # No permission to write to default location of /zeek
@@ -109,7 +110,9 @@ freebsd_task:
   freebsd_instance:
     # FreeBSD 12 EOL: June 30, 2024
     image_family: freebsd-12-1
-    << : *RESOURCES_TEMPLATE
+    cpu: 8
+    # Not allowed to request less than 8GB for an 8 CPU FreeBSD VM.
+    memory: 8GB
   prepare_script: ./ci/freebsd/prepare.sh
   << : *CI_TEMPLATE
 
@@ -117,7 +120,9 @@ memcheck_task:
   container:
     # Just uses a recent/common distro to run memory error/leak checks.
     dockerfile: ci/ubuntu-18.04/Dockerfile
-    << : *RESOURCES_TEMPLATE
+    cpu: 8
+    # AddressSanitizer uses a lot more memory than a typical config.
+    memory: 16GB
   << : *CI_TEMPLATE
   env:
     ZEEK_CI_CONFIGURE_FLAGS: *MEMCHECK_CONFIG
diff --git a/CHANGES b/CHANGES
index e6c981301c..7391447b9a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+3.1.0-dev.527 | 2020-02-03 10:11:00 -0800
+
+  * Change requested memory in Cirrus CI config (Jon Siwek, Corelight)
+
+    The ASan build does require quite a bit more, but also the default
+    release builds should do ok with slightly less.
+
 3.1.0-dev.526 | 2020-02-03 10:04:00 -0800
 
   * Increase timeout value for live interfaces without file descriptors (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 167919b1ad..affde92154 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0-dev.526
+3.1.0-dev.527