[config_drive] Fix _net_data_change assertion for soft-clean scenario #3559
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
hjensas
force-pushed
the
fix-existing-iso-net-data
branch
5 times, most recently
from
5818b87 to
4e82886
Compare
|
recheck |
1 similar comment
|
recheck |
|
recheck |
1 similar comment
|
recheck |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/419b047e9c0f41c08ad5e13284ecec44 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 12m 25s |
|
recheck |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/cdb421daf39145ea93fc40df7f783f2d ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 26m 27s |
|
recheck |
|
Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset. |
hjensas
force-pushed
the
fix-existing-iso-net-data
branch
from
4e82886 to
3ce83b7
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/b517bed810924f1ab8156b0a14be52ae ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 43m 59s |
|
recheck |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/779266e04a9d4b38b1a17a09c8c059ae ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 49m 47s |
hjensas
force-pushed
the
fix-existing-iso-net-data
branch
from
3ce83b7 to
93829c6
Compare
This reverts commit 052ccea.
Apply the same fix as _user_data_change: handle skipped tasks when cifmw_config_drive_networkconfig is undefined on subsequent runs. - Update assert to check: _userdata/_netdata is not none, since these are set in defaults/main.yml they will never be undefined. - Update assertion to check: _net_data_change is skipped or is not changed - Make network-config when condition consistent with user-data (add | length > 0) - Add soft-clean test coverage to default molecule scenario This prevents assertion failures when create-infra is run after a soft clean where the ISO already exists but network-config vars are undefined. Jira: OSPRH-22377 Assisted-By: Claude Code/claude-4.5-sonnet Signed-off-by: Harald Jensås <hjensas@redhat.com>
hjensas
force-pushed
the
fix-existing-iso-net-data
branch
from
93829c6 to
d9b7ca1
Compare
4 participants
Apply the same fix as _user_data_change: handle skipped tasks when
cifmw_config_drive_networkconfigis undefined on subsequent runs._userdata/_netdatais not none, since these are set indefaults/main.ymlthey will never be undefined.| length > 0)This prevents assertion failures when create-infra is run after a soft clean where the ISO already exists but network-config vars are not set.
Jira: OSPRH-22377
Assisted-By: Claude Code/claude-4.5-sonnet