From c45625b9091afece726f547b91e97d3242b9003e Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 30 Mar 2025 17:27:24 +0200 Subject: [PATCH 1/3] CI: Add external plugins to builtin plugins task This clones a few external plugins to include them in a build. Except for zeek-kafka, the others are maintained by the Zeek project. Closes #3535 --- .cirrus.yml | 23 ++++++++++++++----- ci/debian-12/Dockerfile | 2 ++ .../builtin-plugins/external/.btest-ignore | 0 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 testing/builtin-plugins/external/.btest-ignore diff --git a/.cirrus.yml b/.cirrus.yml index 1d01927ddd..e9f86757c6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -768,24 +768,35 @@ zeekctl_debian11_task: upload_zeekctl_testing_artifacts: path: "auxil/zeekctl/testing/.tmp/**" -# Test building Zeek with builtin plugins available in -# testing/builtin-plugins/Files/ -include_plugins_debian11_task: +include_plugins_debian12_task: cpu: *CPUS memory: *MEMORY container: - # Debian 11 EOL: June 2026 - dockerfile: ci/debian-11/Dockerfile + # Debian 12 (bookworm) EOL: TBD + dockerfile: ci/debian-12/Dockerfile << : *RESOURCES_TEMPLATE sync_submodules_script: git submodule update --recursive --init + fetch_external_plugins_script: + - cd /zeek/testing/builtin-plugins/external && git clone https://github.com/zeek/zeek-perf-support.git + - cd /zeek/testing/builtin-plugins/external && git clone https://github.com/zeek/zeek-more-hashes.git + - cd /zeek/testing/builtin-plugins/external && git clone https://github.com/zeek/zeek-cluster-backend-nats.git + - cd /zeek/testing/builtin-plugins/external && git clone https://github.com/SeisoLLC/zeek-kafka.git always: ccache_cache: folder: /tmp/ccache fingerprint_script: echo builtin-plugins-ccache-$ZEEK_CCACHE_EPOCH-$CIRRUS_TASK_NAME-$CIRRUS_OS reupload_on_changes: true - build_script: ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --include-plugins='/zeek/testing/builtin-plugins/Files/protocol-plugin;/zeek/testing/builtin-plugins/Files/py-lib-plugin;/zeek/testing/builtin-plugins/Files/zeek-version-plugin'" ./ci/build.sh + build_script: ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --include-plugins='/zeek/testing/builtin-plugins/Files/protocol-plugin;/zeek/testing/builtin-plugins/Files/py-lib-plugin;/zeek/testing/builtin-plugins/Files/zeek-version-plugin;/zeek/testing/builtin-plugins/external/zeek-perf-support;/zeek/testing/builtin-plugins/external/zeek-more-hashes;/zeek/testing/builtin-plugins/external/zeek-cluster-backend-nats;/zeek/testing/builtin-plugins/external/zeek-kafka'" ./ci/build.sh test_script: - cd testing/builtin-plugins && ../../auxil/btest/btest -d -b -j ${ZEEK_CI_BTEST_JOBS} + test_external_plugins_script: | + . /zeek/build/zeek-path-dev.sh + set -ex + # For now, just check if the external plugins are available. + zeek -N Zeek::PerfSupport + zeek -N Zeek::MoreHashes + zeek -N Zeek::Cluster_Backend_NATS + zeek -N Seiso::Kafka on_failure: upload_include_plugins_testing_artifacts: path: "testing/builtin-plugins/.tmp/**" diff --git a/ci/debian-12/Dockerfile b/ci/debian-12/Dockerfile index bc66a7d39e..63825702b4 100644 --- a/ci/debian-12/Dockerfile +++ b/ci/debian-12/Dockerfile @@ -20,8 +20,10 @@ RUN apt-get update && apt-get -y install \ git \ jq \ libkrb5-dev \ + libnats-dev \ libnode-dev \ libpcap-dev \ + librdkafka-dev \ libssl-dev \ libuv1-dev \ make \ diff --git a/testing/builtin-plugins/external/.btest-ignore b/testing/builtin-plugins/external/.btest-ignore new file mode 100644 index 0000000000..e69de29bb2 From e269b34df14b51e61f2b64805203de630d92c199 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 30 Mar 2025 17:31:17 +0200 Subject: [PATCH 2/3] Bump cmake submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index eede3aab03..cf3b810477 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit eede3aab03b80ade33a757f85dfc29f16a44499b +Subproject commit cf3b810477651791f5e8250fcc9322b108a03ba9 From dfa2d96d2235e96e5885c833a0c88fc3e13ce4c5 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 31 Mar 2025 11:12:27 +0200 Subject: [PATCH 3/3] CI: Upgrade zeekctl task to Debian 12 --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index e9f86757c6..9be142d5f4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -737,7 +737,7 @@ cluster_testing_docker_builder: # # Also triggers on CIRRUS_CRON == 'zeekctl-nightly' if that is configured # through the Cirrus Web UI. -zeekctl_debian11_task: +zeekctl_debian12_task: cpu: *CPUS memory: *MEMORY only_if: > @@ -748,8 +748,8 @@ zeekctl_debian11_task: $CIRRUS_BRANCH =~ 'release/.*' ) ) container: - # Debian 11 EOL: June 2026 - dockerfile: ci/debian-11/Dockerfile + # Debian 12 (bookworm) EOL: TBD + dockerfile: ci/debian-12/Dockerfile << : *RESOURCES_TEMPLATE sync_submodules_script: git submodule update --recursive --init always: