Distribution release variable

Author: assumptionsandg

.github/workflows/ipa-image-build.yml

@@ -206,7 +206,8 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="ubuntu" \
           -e os_release="jammy" \
-          -e ipa_ci_builder_distribution="ubuntu"
+          -e ipa_ci_builder_distribution="ubuntu" \
+          -e ipa_ci_builder_release="jammy"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.ubuntu-jammy
@@ -264,7 +265,8 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="rocky" \
           -e os_release="9" \
-          -e ipa_ci_builder_distribution="rocky"
+          -e ipa_ci_builder_distribution="rocky" \
+          -e ipa_ci_builder_release="9"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.rocky9

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -101,7 +101,7 @@ stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"
 ipa_build_images: true
 ipa_build_dib_env_extra:
   DISTRO_NAME: "{{ ipa_ci_builder_distribution | default('ubuntu') }}"
-  DIB_RELEASE: "{{ os_release }}"
+  DIB_RELEASE: "{{ ipa_ci_builder_release | default('jammy') }}"
 
 # Ensure Ark repos are disabled during CI runs, this is due to
 # builder being a member of the 'overcloud' group for IPA builds.