From 56b596a3e36173d266e732ef8351094290216513 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 19 Nov 2024 10:52:56 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/timw/speed-up-zam-ci-testing'

* origin/topic/timw/speed-up-zam-ci-testing:
  CI: Use test.sh script for running ZAM tests, but disable parts of it

(cherry picked from commit d9a74680e08553b34cb164847f61b0ea00ad1f5f)
---
 .cirrus.yml | 12 ++++++------
 CHANGES     |  9 +++++++++
 VERSION     |  2 +-
 ci/test.sh  | 14 ++++++++++++--
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 450518570a..40af078b21 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -401,12 +401,12 @@ asan_sanitizer_zam_task:
     << : *RESOURCES_TEMPLATE
 
   << : *CI_TEMPLATE
-  test_script:
-    # Run just the btests with zam as alternative.
-    - cd testing/btest && ../../auxil/btest/btest -a zam -A -d -b -j ${ZEEK_CI_BTEST_JOBS}
   env:
     ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG
     ASAN_OPTIONS: detect_leaks=1:detect_odr_violation=0
+    ZEEK_CI_SKIP_UNIT_TESTS: 1
+    ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
+    ZEEK_CI_BTEST_EXTRA_ARGS: -a zam
   << : *ZAM_SKIP_TASK_ON_PR
 
 ubsan_sanitizer_task:
@@ -432,15 +432,15 @@ ubsan_sanitizer_zam_task:
     << : *RESOURCES_TEMPLATE
 
   << : *CI_TEMPLATE
-  test_script:
-    # Run just the btests with zam as alternative.
-    - cd testing/btest && ../../auxil/btest/btest -a zam -A -d -b -j ${ZEEK_CI_BTEST_JOBS}
   env:
     CC: clang-18
     CXX: clang++-18
     ZEEK_CI_CONFIGURE_FLAGS: *UBSAN_SANITIZER_CONFIG
     ZEEK_TAILORED_UB_CHECKS: 1
     UBSAN_OPTIONS: print_stacktrace=1
+    ZEEK_CI_SKIP_UNIT_TESTS: 1
+    ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
+    ZEEK_CI_BTEST_EXTRA_ARGS: -a zam
   << : *ZAM_SKIP_TASK_ON_PR
 
 tsan_sanitizer_task:
diff --git a/CHANGES b/CHANGES
index 9ffff87ba2..7e03228332 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+7.0.3-26 | 2024-11-19 10:56:06 -0700
+
+  * Merge remote-tracking branch 'origin/topic/timw/speed-up-zam-ci-testing' (Tim Wojtulewicz, Corelight)
+
+    * origin/topic/timw/speed-up-zam-ci-testing:
+      CI: Use test.sh script for running ZAM tests, but disable parts of it
+
+    (cherry picked from commit d9a74680e08553b34cb164847f61b0ea00ad1f5f)
+
 7.0.3-24 | 2024-11-19 09:32:54 -0700
 
   * account for spaces encoding to plus signs in sqli regex detection (Cooper Grill)
diff --git a/VERSION b/VERSION
index 447b000b06..e7bc80348c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.3-24
+7.0.3-26
diff --git a/ci/test.sh b/ci/test.sh
index c5304b4512..1d5da9e2a7 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -40,6 +40,11 @@ function banner {
 }
 
 function run_unit_tests {
+    if [[ ${ZEEK_CI_SKIP_UNIT_TESTS} -eq 1 ]]; then
+        printf "Skipping unit tests as requested by task configureation\n\n"
+        return 0
+    fi
+
     banner "Running unit tests"
 
     pushd build
@@ -60,7 +65,7 @@ function run_btests {
     pushd testing/btest
 
     ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
-        ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
+        ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} ${ZEEK_CI_BTEST_EXTRA_ARGS} || result=1
     make coverage
     prep_artifacts
     popd
@@ -68,11 +73,16 @@ function run_btests {
 }
 
 function run_external_btests {
+    if [[ ${ZEEK_CI_SKIP_EXTERNAL_BTESTS} -eq 1 ]]; then
+        printf "Skipping external tests as requested by task configuration\n\n"
+        return 0
+    fi
+
     local zeek_testing_pid=""
     local zeek_testing_pid_private=""
     pushd testing/external/zeek-testing
     ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
-        ${BTEST} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 &
+        ${BTEST} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} ${ZEEK_CI_BTEST_EXTRA_ARGS} >btest.out 2>&1 &
     zeek_testing_pid=$!
     popd