Merge remote-tracking branch 'origin/topic/awelzel/3143-no-more-zeekurity' into release/6.0

* origin/topic/awelzel/3143-no-more-zeekurity:
  cirrus: Stop pushing container images to zeekurity

.cirrus.yml

@@ -407,8 +407,6 @@ windows_task:
   # 2 hour timeout just for potential of building Docker image taking a while
   timeout_in: 120m
   windows_container:
-    # image: cirrusci/windowsservercore:cmake
-    # image: zeekurity/broker-ci-windows:latest
     dockerfile: ci/windows/Dockerfile
     os_version: 2019
     cpu: 8
@@ -608,9 +606,6 @@ container_image_manifest_docker_builder:
     # Tag images and push to Docker Hub and AWS ECR "zeek" account
     - ./ci/container-images-tag-and-push.sh
     - REGISTRY_PREFIX=public.ecr.aws/ ./ci/container-images-tag-and-push.sh
-
-    # Continue to push tags to the "zeekurity" account as well.
-    - ZEEK_IMAGE_REPO=zeekurity ./ci/container-images-tag-and-push.sh
   depends_on:
     - arm64_container_image
     - amd64_container_image

CHANGES

@@ -1,3 +1,15 @@
+6.0.0-rc2.17 | 2023-06-21 11:46:48 -0700
+
+  * cirrus: Stop pushing container images to zeekurity (Arne Welzel, Corelight)
+
+    Closes #3143
+
+  * CI: Force rebuild of tumbleweed VM to pick up newer version of python (Tim Wojtulewicz, Corelight)
+
+    The version of python included in the existing VM doesn't have the sqlite
+    module included for some reason. Forcing the VM to rebuild installs python311
+    which does include it, fixing a build failure.
+
 6.0.0-rc2.12 | 2023-06-15 15:20:20 -0700
 
   * GH-3112: cluster/logger: Fix leftover-log-rotation in multi-logger setups (Arne Welzel, Corelight)

NEWS

@@ -57,6 +57,10 @@ Breaking Changes
   depending on the functionality included in the plugin, may trigger subsequent
   errors during configuration or build.
 
+- Zeek container images are not pushed to the zeekurity organization anymore.
+  Please switch to using the ``zeek/zeek`` image on DockerHub, or the images
+  published to ``public.ecr.aws/zeek/zeek``.
+
 - The IRC_Data analyzer declaration has been moved to protocols/irc/IRC.h.
 
 - The error message returned when using ``bro_init``, ``bro_done``, and

VERSION

@@ -1 +1 @@
-6.0.0-rc2.12
+6.0.0-rc2.17