diff --git a/ansible/inventory/group_vars/all/ipa b/ansible/inventory/group_vars/all/ipa index a9adeca88..724ed04b8 100644 --- a/ansible/inventory/group_vars/all/ipa +++ b/ansible/inventory/group_vars/all/ipa @@ -49,6 +49,7 @@ ipa_build_dib_env_default: DIB_RELEASE: "{{ '9-stream' if os_distribution == 'rocky' else os_release }}" DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}" DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}" + DIB_REPOREF_requirements: "{{ ipa_build_source_version }}" # Dictionary of additional environment variables to provide to Diskimage # Builder (DIB) during IPA image build. diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst index d1dbbab1b..f79ef36a5 100644 --- a/doc/source/configuration/reference/ironic-python-agent.rst +++ b/doc/source/configuration/reference/ironic-python-agent.rst @@ -60,11 +60,14 @@ image build``. ``ipa_build_dib_elements_extra``. ``ipa_build_dib_env_default`` Dictionary of default environment variables to provide to Diskimage Builder - (DIB) during IPA image build. Default is - ``{"DIB_RELEASE": "9-stream", "DIB_REPOLOCATION_ironic_python_agent": "{{ - ipa_build_source_url }}", "DIB_REPOREF_ironic_python_agent": "{{ - ipa_build_source_version }}", "DIB_REPOREF_requirements": "{{ - openstack_branch }}"}``. + (DIB) during IPA image build. Default is ``{"DIB_RELEASE": "9-stream", + "DIB_REPOLOCATION_ironic_python_agent": "{{ ipa_build_source_url }}", + "DIB_REPOREF_ironic_python_agent": "{{ ipa_build_source_version }}", + "DIB_REPOREF_requirements": "{{ ipa_build_source_version }}"}`` if + ``os_distribution`` is ``"rocky"`` else ``{"DIB_RELEASE": "{{ os_release + }}", "DIB_REPOLOCATION_ironic_python_agent": "{{ ipa_build_source_url }}", + "DIB_REPOREF_ironic_python_agent": "{{ ipa_build_source_version }}", + "DIB_REPOREF_requirements": "{{ ipa_build_source_version }}"}``. ``ipa_build_dib_env_extra`` Dictionary of additional environment variables to provide to Diskimage Builder (DIB) during IPA image build. Default is empty. diff --git a/releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml b/releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml new file mode 100644 index 000000000..9f64be344 --- /dev/null +++ b/releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Pin requirements for IPA image build to ensure that the ``ironic-lib`` + version matches ``ironic-python-agent``. + LP#2089263 `__ diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5c6454f54..68ce540e4 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -18,13 +18,9 @@ - kayobe-overcloud-host-configure-rocky9 - kayobe-overcloud-host-configure-centos9s - kayobe-overcloud-host-configure-ubuntu-jammy - - kayobe-overcloud-upgrade-rocky9 - - kayobe-overcloud-upgrade-ubuntu-jammy - kayobe-seed-rocky9 - kayobe-seed-ubuntu-jammy - kayobe-seed-images-rocky9 - - kayobe-seed-upgrade-rocky9 - - kayobe-seed-upgrade-ubuntu-jammy - kayobe-seed-vm-rocky9 - kayobe-seed-vm-rocky9-efi - kayobe-seed-vm-ubuntu-jammy @@ -42,12 +38,8 @@ - kayobe-overcloud-tls-rocky9 - kayobe-overcloud-host-configure-rocky9 - kayobe-overcloud-host-configure-ubuntu-jammy - - kayobe-overcloud-upgrade-rocky9 - - kayobe-overcloud-upgrade-ubuntu-jammy - kayobe-seed-rocky9 - kayobe-seed-ubuntu-jammy - - kayobe-seed-upgrade-rocky9 - - kayobe-seed-upgrade-ubuntu-jammy - kayobe-seed-vm-rocky9 - kayobe-seed-vm-ubuntu-jammy - kayobe-infra-vm-rocky9