diff --git a/.cirrus.yml b/.cirrus.yml index 877479df72..1fa9e0a526 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: @@ -745,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/**" diff --git a/CHANGES b/CHANGES index 6c479fed9d..7d887e8289 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.2.0-dev.232 | 2025-02-25 07:29:43 -0700 + + * CI: Use the right variable for the number of test jobs for zeekctl_debian11_task tasks (Tim Wojtulewicz, Corelight) + + * CI: Use fewer btest jobs for ZAM tasks (Tim Wojtulewicz, Corelight) + 7.2.0-dev.228 | 2025-02-24 11:37:42 -0700 * Fix incorrect syntax for static_cast in to_count that I introduced in a previous merge (Mark Overholser) diff --git a/VERSION b/VERSION index f9bafca8cd..ebc0753e79 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-dev.228 +7.2.0-dev.232