Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronise 2024.1 with upstream #49

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Synchronise 2024.1 with upstream #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d8b689
[stable-only] CI: Remove SLURP upgrade job
priteau Dec 20, 2024
c84cda2
Fix leading and trailing whitespace in inspection_callback_url
jovial Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
mode: "0644"
vars:
inspection_callback_url: >-
{% if enable_inspector | bool %}
{%- if enable_inspector | bool -%}
{{ api_protocol }}://{{ internal_ip }}:5050/v1/continue
{% else %}
{%- else -%}
{{ api_protocol }}://{{ internal_ip }}:6385/v1/continue_inspection
{% endif %}
{%- endif -%}
8 changes: 8 additions & 0 deletions releasenotes/notes/fix-whitespace-in-inspection-callback-3f450db7ae2c91d5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
fixes:
- |
Fixes an issue where ``inspection_callback_url`` was templated with leading
whitespace. This caused the ``ipa-inspection-callback-url`` kernel command
line argument to be incorrectly set, leading to Ironic Python Agent posting
introspection data back to Ironic rather than Ironic Inspector when using
the ``enable_inspector`` option.
13 changes: 1 addition & 12 deletions zuul.d/bifrost-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
run: playbooks/ci/upgrade.yaml
timeout: 9600
vars:
upgrade_from: stable/2023.1
upgrade_from: stable/2023.2
skip_upgrade:
- openstack/diskimage-builder

Expand All @@ -228,17 +228,6 @@
enable_keystone: true
noauth_mode: false

- job:
name: bifrost-slurp-upgrade
parent: bifrost-upgrade
vars:
upgrade_from: stable/2023.1

- job:
name: bifrost-slurp-upgrade-ubuntu-jammy
parent: bifrost-slurp-upgrade
nodeset: ubuntu-jammy

# NOTE(TheJulia): This job is for use on the ironic repository,
# to provide a minimal platform where we can execute a job where
# basic performance numbers will be referenced/collected.
Expand Down
2 changes: 0 additions & 2 deletions zuul.d/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
- bifrost-upgrade-ubuntu-jammy
- bifrost-upgrade-keystone-centos9
# Non-voting jobs
- bifrost-slurp-upgrade-ubuntu-jammy:
voting: false
- bifrost-integration-redfish-pxe-uefi-centos-9:
voting: false
- bifrost-integration-dhcp-ubuntu-jammy:
Expand Down