From b5b0c5c9965cced7353481483838ac0516e8e5eb Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 24 Feb 2025 11:17:10 -0700
Subject: [PATCH 1/2] CI: Use fewer btest jobs for ZAM tasks

The ZAM tasks are being killed due to OOM issues on Cirrus while
running btests. Use fewer jobs try to avoid that.
---
 .cirrus.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 877479df72..2f4e88266a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -424,6 +424,8 @@ asan_sanitizer_zam_task:
     ZEEK_CI_SKIP_UNIT_TESTS: 1
     ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
     ZEEK_CI_BTEST_EXTRA_ARGS: -a zam
+    # Use a lower number of jobs due to OOM issues with ZAM tasks
+    ZEEK_CI_BTEST_JOBS: 3
   << : *ZAM_SKIP_TASK_ON_PR
 
 ubsan_sanitizer_task:
@@ -458,6 +460,8 @@ ubsan_sanitizer_zam_task:
     ZEEK_CI_SKIP_UNIT_TESTS: 1
     ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
     ZEEK_CI_BTEST_EXTRA_ARGS: -a zam
+    # Use a lower number of jobs due to OOM issues with ZAM tasks
+    ZEEK_CI_BTEST_JOBS: 3
   << : *ZAM_SKIP_TASK_ON_PR
 
 tsan_sanitizer_task:

From 3dd1d37f9ddaa0fa61b68d0042a8c2b724c4bcd0 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 24 Feb 2025 11:18:13 -0700
Subject: [PATCH 2/2] CI: Use the right variable for the number of test jobs
 for zeekctl_debian11_task tasks

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2f4e88266a..1fa9e0a526 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -749,7 +749,7 @@ zeekctl_debian11_task:
   build_script:
     - cd auxil/zeekctl/testing && ./Scripts/build-zeek
   test_script:
-    - cd auxil/zeekctl/testing && ../../btest/btest -A -d -j ${BTEST_JOBS}
+    - cd auxil/zeekctl/testing && ../../btest/btest -A -d -j ${ZEEK_CI_BTEST_JOBS}
   on_failure:
     upload_zeekctl_testing_artifacts:
       path: "auxil/zeekctl/testing/.tmp/**"