From 92ffda9be15c62f8dfd29fdd6d347aa015b0775e Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Wed, 4 Dec 2024 13:08:53 +0000
Subject: [PATCH] Set distro in builder config

---
 .github/workflows/package-build-ofed.yml           | 4 ++--
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/package-build-ofed.yml b/.github/workflows/package-build-ofed.yml
index 162452467f..4605a2ad0f 100644
--- a/.github/workflows/package-build-ofed.yml
+++ b/.github/workflows/package-build-ofed.yml
@@ -206,7 +206,7 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="ubuntu" \
           -e os_release="jammy" \
-          -e ipa_build_dib_env_extra='{"DISTRO_NAME": "ubuntu"}'
+          -e ipa_ci_builder_distribution="ubuntu"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.ubuntu-jammy
@@ -262,7 +262,7 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="rocky" \
           -e os_release="9" \
-          -e ipa_build_dib_env_extra='{"DISTRO_NAME": "rocky"}'
+          -e ipa_ci_builder_distribution="rocky"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.rocky9
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 8bf11ae3d8..9ac2f4c9b9 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -99,3 +99,5 @@ stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"
 
 # Build during IPA builder workflow
 ipa_build_images: true
+ipa_build_dib_env_extra:
+  DISTRO_NAME: "{{ ipa_ci_builder_distribution | default('ubuntu') }}"