Set distro in builder config

stackhpc · Dec 4, 2024 · 92ffda9 · 92ffda9
1 parent 78e44e0
commit 92ffda9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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') }}"