From e5de10eb18b0eb36bd513732f3ff427703e9a741 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 1 Oct 2025 15:07:54 -0500
Subject: [PATCH] Build 2025.2 libvirt images

Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
Change-Id: I54b67ab820cc06b5a08ecf5234131507e59013b3
---
 libvirt/Dockerfile  |  2 +-
 zuul.d/libvirt.yaml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libvirt/Dockerfile b/libvirt/Dockerfile
index aa4c741a..a361b7a4 100644
--- a/libvirt/Dockerfile
+++ b/libvirt/Dockerfile
@@ -22,7 +22,7 @@ RUN <<EOF /bin/bash
       exit 1
     fi
   elif [ "$(lsb_release -sc)" = "noble" ]; then
-    if [[ "${RELEASE}" = "dalmatian" || "${RELEASE}" = "epoxy" ]]; then
+    if [[ "${RELEASE}" = "dalmatian" || "${RELEASE}" = "epoxy" || "${RELEASE}" = "flamingo" ]]; then
       echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu $(lsb_release -sc)-updates/${RELEASE} main" > /etc/apt/sources.list.d/cloudarchive.list
     else
       echo "${RELEASE} is not supported on $(lsb_release -sc)"
diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml
index 435b8499..d1251472 100644
--- a/zuul.d/libvirt.yaml
+++ b/zuul.d/libvirt.yaml
@@ -28,8 +28,8 @@
         - openstack-helm-images-upload-libvirt
         - openstack-helm-images-promote-libvirt:
             dependencies:
-              - name: openstack-helm-images-compute-kit-2024-2-ubuntu_jammy
-        - openstack-helm-images-compute-kit-2024-2-ubuntu_jammy
+              - name: openstack-helm-images-compute-kit-2025-1-ubuntu_jammy
+        - openstack-helm-images-compute-kit-2025-1-ubuntu_jammy
 
 - job:
     name: openstack-helm-images-build-libvirt
@@ -38,19 +38,6 @@
     vars: &libvirt_vars
       currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
       docker_images:
-        - context: libvirt
-          repository: openstackhelm/libvirt
-          dockerfile: Dockerfile
-          arch:
-            - linux/amd64
-          tags:
-            - "bobcat-ubuntu_jammy-{{ currentdate }}"
-            - "bobcat-ubuntu_jammy"
-            - "2023.2-ubuntu_jammy-{{ currentdate }}"
-            - "2023.2-ubuntu_jammy"
-          build_args:
-            - FROM=ubuntu:jammy
-            - RELEASE=bobcat
         - context: libvirt
           repository: openstackhelm/libvirt
           dockerfile: Dockerfile
@@ -90,6 +77,19 @@
           build_args:
             - FROM=ubuntu:noble
             - RELEASE=epoxy
+        - context: libvirt
+          repository: openstackhelm/libvirt
+          dockerfile: Dockerfile
+          arch:
+            - linux/amd64
+          tags:
+            - "flamingo-ubuntu_noble-{{ currentdate }}"
+            - "flamingo-ubuntu_noble"
+            - "2025.2-ubuntu_noble-{{ currentdate }}"
+            - "2025.2-ubuntu_noble"
+          build_args:
+            - FROM=ubuntu:noble
+            - RELEASE=flamingo
     files: &libvirt_files
       - libvirt/.*
       - zuul.d/libvirt.yaml