From ded9651129b463d776f4c1d291826d99bd0291e6 Mon Sep 17 00:00:00 2001
From: Nicholas Kuechler <nicholas.kuechler@rackspace.com>
Date: Mon, 30 Mar 2026 15:44:36 -0500
Subject: [PATCH] feat(images): Adds Debian Trixie ironic IPA image

---
 .github/workflows/build-ironic-images.yaml |  2 +-
 ironic-images/ipa-debian-bookworm.yaml     |  3 +++
 ironic-images/ipa-debian-trixie.yaml       | 13 +++++++++++++
 ironic-images/requirements.txt             |  4 ++--
 ironic-images/ubuntu.yaml                  |  3 +++
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 ironic-images/ipa-debian-trixie.yaml

diff --git a/.github/workflows/build-ironic-images.yaml b/.github/workflows/build-ironic-images.yaml
index 36acccae8..93a1de1fc 100644
--- a/.github/workflows/build-ironic-images.yaml
+++ b/.github/workflows/build-ironic-images.yaml
@@ -112,7 +112,7 @@ jobs:
           mkdir -p upload
           find . -maxdepth 1 -type f \( -name '*.qcow2' -o -name '*.kernel' -o -name '*.initramfs' \) -exec cp {} upload/ \;
         env:
-          DIB_RELEASE: ${{ env.release }}
+          # DIB_RELEASE: ${{ env.release }}
           ELEMENTS_PATH: "${{ env.distro == 'ipa-debian' && format('{0}/share/ironic-python-agent-builder/dib:{1}/ironic-images/custom_elements', env.pythonLocation, github.workspace) || ''}}"
 
       - name: Set timestamp environment variable
diff --git a/ironic-images/ipa-debian-bookworm.yaml b/ironic-images/ipa-debian-bookworm.yaml
index e4552d045..d35789233 100644
--- a/ironic-images/ipa-debian-bookworm.yaml
+++ b/ironic-images/ipa-debian-bookworm.yaml
@@ -1,4 +1,7 @@
 - imagename: ipa-debian-bookworm
+  environment:
+    DISTRO_NAME: 'debian'
+    DIB_RELEASE: 'bookworm'
   elements:
   - ironic-python-agent-ramdisk
   - debian-minimal
diff --git a/ironic-images/ipa-debian-trixie.yaml b/ironic-images/ipa-debian-trixie.yaml
new file mode 100644
index 000000000..5937ad9dc
--- /dev/null
+++ b/ironic-images/ipa-debian-trixie.yaml
@@ -0,0 +1,13 @@
+- imagename: ipa-debian-trixie
+  environment:
+    DISTRO_NAME: 'debian'
+    DIB_RELEASE: 'trixie'
+  elements:
+  - ironic-python-agent-ramdisk
+  - debian-minimal
+  - dynamic-login
+  - journal-to-console
+  - package-installs
+  - undercloud-ipa
+  - install-static
+  - undercloud-proliant-tools
diff --git a/ironic-images/requirements.txt b/ironic-images/requirements.txt
index de6076cf4..e71483e59 100644
--- a/ironic-images/requirements.txt
+++ b/ironic-images/requirements.txt
@@ -1,2 +1,2 @@
-diskimage-builder==3.40.1
-ironic-python-agent-builder==6.2.0
+diskimage-builder==3.41.0
+ironic-python-agent-builder==7.2.0
diff --git a/ironic-images/ubuntu.yaml b/ironic-images/ubuntu.yaml
index cb7c2a6d6..a41c82f0f 100644
--- a/ironic-images/ubuntu.yaml
+++ b/ironic-images/ubuntu.yaml
@@ -1,4 +1,7 @@
 - imagename: ubuntu-noble
+  environment:
+    DISTRO_NAME: 'ubuntu'
+    DIB_RELEASE: 'noble'
   elements:
   - ubuntu
   - grub2