From 5474cd048c8db5bedd4f23eabeeb38b9ba60836b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 22 Sep 2025 17:37:05 +0200
Subject: [PATCH] CI: Ubuntu 24.10 is EOL, 25.04 is current

---
 .gitlab-ci.yml                                | 22 +++++++++----------
 .../Dockerfile                                |  4 ++--
 misc/gitlab/data.yml.j2                       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename misc/docker/{ubuntu-24.10-amd64 => ubuntu-25.04-amd64}/Dockerfile (92%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b78455c3..d12a20880 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -310,9 +310,9 @@ docker-ubuntu-24.04-amd64:
     IMG_NAME: "ubuntu-24.04-amd64"
   <<: *docker-build
 
-docker-ubuntu-24.10-amd64:
+docker-ubuntu-25.04-amd64:
   variables:
-    IMG_NAME: "ubuntu-24.10-amd64"
+    IMG_NAME: "ubuntu-25.04-amd64"
   <<: *docker-build
 
 
@@ -619,12 +619,12 @@ build-ubuntu-24.04-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
 
-build-ubuntu-24.10-amd64:
+build-ubuntu-25.04-amd64:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-ubuntu-24.10-amd64
+    - job: docker-ubuntu-25.04-amd64
       optional: true
-  image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-25.04-amd64
 
 
 #######################################################
@@ -999,13 +999,13 @@ pkg-ubuntu-24.04-amd64:
     - job: build-release
   image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
 
-pkg-ubuntu-24.10-amd64:
+pkg-ubuntu-25.04-amd64:
   <<: *pkg-deb
   needs:
-    - job: build-ubuntu-24.10-amd64
+    - job: build-ubuntu-25.04-amd64
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-25.04-amd64
 
 
 ## Package installability checks
@@ -1267,11 +1267,11 @@ install-ubuntu-24.04-amd64:
     - job: pkg-ubuntu-24.04-amd64
   image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
 
-install-ubuntu-24.10-amd64:
+install-ubuntu-25.04-amd64:
   <<: *install-deb
   needs:
-    - job: pkg-ubuntu-24.10-amd64
-  image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
+    - job: pkg-ubuntu-25.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-25.04-amd64
 
 
 ###################################
diff --git a/misc/docker/ubuntu-24.10-amd64/Dockerfile b/misc/docker/ubuntu-25.04-amd64/Dockerfile
similarity index 92%
rename from misc/docker/ubuntu-24.10-amd64/Dockerfile
rename to misc/docker/ubuntu-25.04-amd64/Dockerfile
index 2c7df91f7..f72583b31 100644
--- a/misc/docker/ubuntu-24.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-25.04-amd64/Dockerfile
@@ -1,5 +1,5 @@
 # bump this to refresh the image: 1
-FROM ubuntu:24.10
+FROM ubuntu:25.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
@@ -11,7 +11,7 @@ RUN apt-get -y --no-install-recommends install \
 	autoconf \
 	ncurses-dev \
 	libreadline-dev \
-	libssh-gcrypt-dev \
+	libssh-dev \
 	linuxdoc-tools-latex \
 	texlive-latex-extra \
 	opensp \
diff --git a/misc/gitlab/data.yml.j2 b/misc/gitlab/data.yml.j2
index 7dd48a5e2..7867f70c2 100644
--- a/misc/gitlab/data.yml.j2
+++ b/misc/gitlab/data.yml.j2
@@ -48,7 +48,7 @@ distros:
   {% endfor %}
 
   # Ubuntu regular builds
-  {% for num in ('20.04', '22.04', '24.04', '24.10') -%}
+  {% for num in ('20.04', '22.04', '24.04', '25.04') -%}
   - name: ubuntu-{{ num }}-amd64
     type: pkg-deb
   {% endfor %}
-- 
2.47.3