Skip to content

Commit

Permalink
Merge pull request #361 from stackhpc/upstream/2023.1-2025-01-13
Browse files Browse the repository at this point in the history
Synchronise 2023.1 with upstream
  • Loading branch information
priteau authored Jan 13, 2025
2 parents d71637f + e2d9810 commit 8565fd9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
1 change: 1 addition & 0 deletions ansible/inventory/group_vars/all/ipa
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 8 additions & 5 deletions doc/source/configuration/reference/ironic-python-agent.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Pin requirements for IPA image build to ensure that the ``ironic-lib``
version matches ``ironic-python-agent``.
LP#2089263 <https://bugs.launchpad.net/kayobe/+bug/2089263>`__
8 changes: 0 additions & 8 deletions zuul.d/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 8565fd9

Please sign in to comment.