Merge remote-tracking branch 'origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24'

* origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24:
  Move benchmarking to Ubnutu 24 task, add to normal PR builds
  Reorder ubuntu builds so 22.04 comes last
  Rename Ubuntu-based tasks to have the full version name
  Switch Zeek Spicy builds to Ubuntu 24

.cirrus.yml

@@ -365,17 +365,22 @@ ubuntu25_04_task:
   << : *ONLY_IF_PR_MASTER_RELEASE
   << : *SKIP_IF_PR_NOT_FULL_CI
 
-ubuntu24_task:
+ubuntu24_04_task:
   container:
     # Ubuntu 24.04 EOL: Jun 2029
     dockerfile: ci/ubuntu-24.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *ONLY_IF_PR_MASTER_RELEASE
-  << : *SKIP_IF_PR_NOT_FULL_CI
+  << : *SKIP_IF_PR_SKIP_ALL
+  env:
+    ZEEK_CI_CREATE_ARTIFACT: 1
+  upload_binary_artifacts:
+    path: build.tgz
+  benchmark_script: ./ci/benchmark.sh
 
 # Same as above, but running the ZAM tests instead of the regular tests.
-ubuntu24_zam_task:
+ubuntu24_04_zam_task:
   container:
     # Ubuntu 24.04 EOL: Jun 2029
     dockerfile: ci/ubuntu-24.04/Dockerfile
@@ -391,7 +396,7 @@ ubuntu24_zam_task:
     ZEEK_CI_BTEST_JOBS: 3
 
 # Same as above, but using Clang and libc++
-ubuntu24_clang_libcpp_task:
+ubuntu24_04_clang_libcpp_task:
   container:
     # Ubuntu 24.04 EOL: Jun 2029
     dockerfile: ci/ubuntu-24.04/Dockerfile
@@ -404,7 +409,7 @@ ubuntu24_clang_libcpp_task:
     CXX: clang++-19
     CXXFLAGS: -stdlib=libc++
 
-ubuntu24_clang_tidy_task:
+ubuntu24_04_clang_tidy_task:
   container:
     # Ubuntu 24.04 EOL: Jun 2029
     dockerfile: ci/ubuntu-24.04/Dockerfile
@@ -417,25 +422,11 @@ ubuntu24_clang_tidy_task:
     CXX: clang++-19
     ZEEK_CI_CONFIGURE_FLAGS: *CLANG_TIDY_CONFIG
 
-ubuntu22_task:
-  container:
-    # Ubuntu 22.04 EOL: June 2027
-    dockerfile: ci/ubuntu-22.04/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-  << : *ONLY_IF_PR_MASTER_RELEASE
-  << : *SKIP_IF_PR_NOT_FULL_OR_BENCHMARK
-  env:
-    ZEEK_CI_CREATE_ARTIFACT: 1
-  upload_binary_artifacts:
-    path: build.tgz
-  benchmark_script: ./ci/benchmark.sh
-
 # Also enable Spicy SSL for this
-ubuntu22_spicy_task:
+ubuntu24_04_spicy_task:
   container:
-    # Ubuntu 22.04 EOL: April 2027
+    # Ubuntu 24.04 EOL: Jun 2029
-    dockerfile: ci/ubuntu-22.04/Dockerfile
+    dockerfile: ci/ubuntu-24.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *ONLY_IF_PR_MASTER_RELEASE
@@ -448,10 +439,10 @@ ubuntu22_spicy_task:
     path: build.tgz
   benchmark_script: ./ci/benchmark.sh
 
-ubuntu22_spicy_head_task:
+ubuntu24_04_spicy_head_task:
   container:
-    # Ubuntu 22.04 EOL: April 2027
+    # Ubuntu 24.04 EOL: Jun 2029
-    dockerfile: ci/ubuntu-22.04/Dockerfile
+    dockerfile: ci/ubuntu-24.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *ONLY_IF_PR_MASTER_RELEASE_NIGHTLY
@@ -466,6 +457,15 @@ ubuntu22_spicy_head_task:
     path: build.tgz
   benchmark_script: ./ci/benchmark.sh
 
+ubuntu22_04_task:
+  container:
+    # Ubuntu 22.04 EOL: June 2027
+    dockerfile: ci/ubuntu-22.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  << : *ONLY_IF_PR_MASTER_RELEASE
+  << : *SKIP_IF_PR_NOT_FULL_CI
+
 alpine_task:
   container:
     # Alpine releases typically happen every 6 months w/ support for 2 years.

CHANGES

@@ -1,3 +1,16 @@
+8.1.0-dev.480 | 2025-08-29 15:08:29 -0700
+
+  * Move benchmarking to Ubnutu 24 task, add to normal PR builds (Tim Wojtulewicz, Corelight)
+
+    We already have a "regular Linux" build for PRs, but I'm adding this one
+    in so that we have benchmark coverage on PRs as well.
+
+  * Reorder ubuntu builds so 22.04 comes last (Tim Wojtulewicz, Corelight)
+
+  * Rename Ubuntu-based tasks to have the full version name (Tim Wojtulewicz, Corelight)
+
+  * Switch Zeek Spicy builds to Ubuntu 24 (Tim Wojtulewicz, Corelight)
+
 8.1.0-dev.475 | 2025-08-28 15:19:59 -0700
 
   * gen-zam: Move source files up a directory (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-8.1.0-dev.475
+8.1.0-dev.480

ci/ubuntu-24.04/Dockerfile

@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20250522
+ENV DOCKERFILE_VERSION=20250522
 
 RUN apt-get update && apt-get -y install \
     bc \
@@ -32,7 +32,9 @@ RUN apt-get update && apt-get -y install \
     make \
     python3 \
     python3-dev \
+    python3-git \
     python3-pip \
+    python3-semantic-version \
     redis-server \
     ruby \
     sqlite3 \