Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/few-btest-jobs-for-zam-ci-tasks'

Browse source 
* origin/topic/timw/few-btest-jobs-for-zam-ci-tasks:
  CI: Use the right variable for the number of test jobs for zeekctl_debian11_task tasks
  CI: Use fewer btest jobs for ZAM tasks
This commit is contained in:
Tim Wojtulewicz 2025-02-25 07:29:43 -07:00
commit 3c16b0720a
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.cirrus.yml
View file

@ -424,6 +424,8 @@ asan_sanitizer_zam_task:
ZEEK_CI_SKIP_UNIT_TESTS: 1 ZEEK_CI_SKIP_UNIT_TESTS: 1
ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1 ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
ZEEK_CI_BTEST_EXTRA_ARGS: -a zam 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 << : *ZAM_SKIP_TASK_ON_PR
ubsan_sanitizer_task: ubsan_sanitizer_task:
@ -458,6 +460,8 @@ ubsan_sanitizer_zam_task:
ZEEK_CI_SKIP_UNIT_TESTS: 1 ZEEK_CI_SKIP_UNIT_TESTS: 1
ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1 ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
ZEEK_CI_BTEST_EXTRA_ARGS: -a zam 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 << : *ZAM_SKIP_TASK_ON_PR
tsan_sanitizer_task: tsan_sanitizer_task:
@ -745,7 +749,7 @@ zeekctl_debian11_task:
build_script: build_script:
- cd auxil/zeekctl/testing && ./Scripts/build-zeek - cd auxil/zeekctl/testing && ./Scripts/build-zeek
test_script: 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: on_failure:
upload_zeekctl_testing_artifacts: upload_zeekctl_testing_artifacts:
path: "auxil/zeekctl/testing/.tmp/**" path: "auxil/zeekctl/testing/.tmp/**"

6
CHANGES
View file

@ -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 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) * Fix incorrect syntax for static_cast in to_count that I introduced in a previous merge (Mark Overholser)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.228 7.2.0-dev.232