Skip to content

Feature branch sync - pub/q2_upgrade to staging#4756

Merged
abhishek-sa1 merged 2 commits into
stagingfrom
pub/q2_upgrade
Jun 16, 2026
Merged

Feature branch sync - pub/q2_upgrade to staging#4756
abhishek-sa1 merged 2 commits into
stagingfrom
pub/q2_upgrade

Conversation

@abhishek-sa1

Copy link
Copy Markdown
Collaborator

Feature branch sync - pub/q2_upgrade to staging

sujit-jadhav and others added 2 commits June 15, 2026 15:05
… add file path in error (#4753)

Fixes OMN01D-2552: Input validation missing for PXE mapping ADMIN_IP
and network_spec additional_subnets consistency checks.

Issues fixed:
1. Remove duplicate subnet consistency check from high_availability_validation.py
   that caused the same error to appear against both provision_config.yml and
   high_availability_config.yml. The check now runs only in provision_validation.
2. Include the PXE mapping file path in the error_key so the rendered message
   shows which file contains the misconfigured ADMIN_IP:
   [pxe_mapping_file_path]: ADMIN_IP subnet consistency

Files changed:
- high_availability_validation.py: removed validate_all_host_ips_same_subnet_as_vip
  call and unused import
- provision_validation.py: prepend pxe_mapping_file_path to error_key
- test_additional_subnets_validation.py: assert file path present in error_key

Signed-off-by: Sujit Jadhav <sujit.jadhav@dell.com>
* fix BuildStream rollback source directory restoration
- Remove existing 2.2 source directory completely before restoring from backup
- Remove failed_when: false from source directory restoration task to catch errors

Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>

* fix BuildStream rollback watcher service restart and validation

Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>

* refactor BuildStream rollback watcher service validation to use systemd_service module

Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>

---------

Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>
@abhishek-sa1 abhishek-sa1 marked this pull request as ready for review June 16, 2026 05:14
@abhishek-sa1 abhishek-sa1 merged commit 392c631 into staging Jun 16, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants