From 721ff91ac096ffad1f87bd303360606e5c09924a Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@corelight.com>
Date: Tue, 19 Aug 2025 09:12:51 +0100
Subject: [PATCH] CI: Ubuntu 24.10 is eol, add Ubuntu 25.04

---
 .cirrus.yml                                  | 6 +++---
 ci/{ubuntu-24.10 => ubuntu-25.04}/Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename ci/{ubuntu-24.10 => ubuntu-25.04}/Dockerfile (98%)

diff --git a/.cirrus.yml b/.cirrus.yml
index 818291afa3..9e29ee7e91 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -296,10 +296,10 @@ weekly_current_clang_task:
   env:
     ZEEK_CI_COMPILER: clang
 
-ubuntu24_10_task:
+ubuntu25_04_task:
   container:
-    # Ubuntu 24.10 EOL: 2025-07-30
-    dockerfile: ci/ubuntu-24.10/Dockerfile
+    # Ubuntu 25.04 EOL: 2026-01-31
+    dockerfile: ci/ubuntu-25.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
diff --git a/ci/ubuntu-24.10/Dockerfile b/ci/ubuntu-25.04/Dockerfile
similarity index 98%
rename from ci/ubuntu-24.10/Dockerfile
rename to ci/ubuntu-25.04/Dockerfile
index 52fb682c10..7bec70c7b4 100644
--- a/ci/ubuntu-24.10/Dockerfile
+++ b/ci/ubuntu-25.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.10
+FROM ubuntu:25.04
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"