Skip to content

Fix for bss and cloudinit update for service_kube_control_plane_x86_64 and display banner message #4645

Merged
abhishek-sa1 merged 18 commits into
dell:pub/q2_upgradefrom
Katakam-Rakesh:pub/q2_upgrade
Jun 2, 2026
Merged

Fix for bss and cloudinit update for service_kube_control_plane_x86_64 and display banner message #4645
abhishek-sa1 merged 18 commits into
dell:pub/q2_upgradefrom
Katakam-Rakesh:pub/q2_upgrade

Conversation

@Katakam-Rakesh
Copy link
Copy Markdown
Collaborator

@Katakam-Rakesh Katakam-Rakesh commented Jun 2, 2026

  1. Added K8s and Slurm configuration detection - New playbook section that reads software_config.json and sets flags:
    • k8s_upgrade_enabled - checks if service_k8s is configured
    • slurm_upgrade_enabled - checks if slurm_custom is configured
  2. Enhanced upgrade banner with conditional messaging:
    • Shows "SKIPPED" for K8s/Slurm steps if not configured
    • Updated pre-flight checklist to be conditional based on what's enabled
    • Changed confirmation from "Press ENTER" to requiring explicit "yes" input
  3. Added validation for operator confirmation:
    • New task that fails if user doesn't type "yes"
    • Provides clear abort message with instructions
  4. Added condition checks for groups_cp (control plane groups):
    • Checks if groups_cp | default([]) | length > 0 before updating BSS for additional control planes
    • Changed HA check from ha_config_data.service_k8s_cluster_ha | length > 1 to groups_cp | default([]) | length > 0
  5. Added new task for when there are no additional control planes:
    • Sets BSS status to "completed" with note "Skipped - no additional control planes to update"
    • Only runs when groups_cp length is 0

Katakam-Rakesh and others added 18 commits June 2, 2026 13:12
Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
… followed by pipeline yml files. (#4632)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
…tatus to Unknown

Bug 1: ADMIN_MAC picking InfiniBand MAC
- Root cause: Ethernet NIC search only excluded iDRAC NICs, not InfiniBand NICs
- When all Ethernet NICs had UNKNOWN status, the fallback picked an IB NIC MAC
- Fix: Add INFINIBAND filter to both primary and deviceNics fallback search

Bug 2: Missing LINK STATUS for UNKNOWN NICs in discovery report
- Root cause: null/empty LinkStatus defaulted to empty string
- Fix: Default to 'Unknown' in all 5 LinkStatus fallback expressions

Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
upgrade slurm backup updated

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
…when additional cp are present

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
- Fix line length issue on line 502 (split long line)
- Remove trailing spaces on line 524

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
@abhishek-sa1 abhishek-sa1 merged commit d283752 into dell:pub/q2_upgrade Jun 2, 2026
3 checks passed
abhishek-sa1 added a commit that referenced this pull request Jun 2, 2026
* no slot matching for single nic

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Merge pull request #4456 from jagadeeshnv/pub/q2_upgrade

Upgrade tasks for slurm

* ldms image tag changes in service_k8s.json anf values.yaml (#4511)

* ldms image tag changes in service_k8s.json anf values.yaml

Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>

---------

Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>

* Merge pull request #4516 from abhishek-sa1/pub/q2_upgrade

Image build fix for buildstream

* Perform gitlab config and pipeline upgrade as part of upgrade_build_stream.yml playbook. (#4513)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Merge pull request #4519 from mithileshreddy04/pub/q2_upgrade_fix4

Fix for undefined variable error in pre upgrade check

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook (#4521)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Upgrade fixes for tag component and approval file update (#4522)

* Update upgrade_oim.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update build_image_common.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* upgrade fixes

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update upgrade.yml

* upgrade approval

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update bss.yaml.j2

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Merge pull request #4523 from mithileshreddy04/pub/q2_upgrade_fix4

Fix telemetry upgrade transform when ldms enabled

* Update create_k8s_config_nfs.yml

Signed-off-by: snarthan <narthan.s@dell.com>

* Update ci-group-service_kube_control_plane_first_x86_64.yaml.j2

Signed-off-by: snarthan <narthan.s@dell.com>

* Update ci-group-service_kube_control_plane_x86_64.yaml.j2

Signed-off-by: snarthan <narthan.s@dell.com>

* Upgrade for slurm with reboot tracking complete

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Upgrade input parameters new

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* csi powerscale chnages for version directory

* updating the folder paths

* correcting folder path

* change the path

* rearrangement of telemetry files for upgrade easiness (#4527)

* rearrangement of telemetry files for upgrade easiness

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* fix for UT issues

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* keep old timeout

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

---------

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* correcting the path for csi driver powerscale

* Rollback WIP - added code similar to upgrade_slurm

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* input validation for telemetry_storage_config.yml (#4529)

* input validation for telemetry_storage_config.yml

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* revert wrongly generated code changes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* upgrade template update

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* add schema json

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* schema validation

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* add replica count

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* refer from telemetry_storage_config.yml

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* refer from telemetry_storage_config.yml

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* update telemetry.sh

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* UT fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* pylint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

---------

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* Rollback working v1.0

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* chnages

* removing the hardcoded nfs directory creation

* correcting install code

* csi 2.16 installation directory chnages for upgrade usecase

* ansible lint fix

* lint fixes

* ACL permission for build_image_x86 and aarch_64 (#4525)

* ACL permission

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* delegate task and verbosity

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* cloudinit status check

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* Revert "cloudinit status check"

This reverts commit fd168a2a006de16faae91817d24bcf236b8fa40e.

---------

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* Update main.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update get_powerscale_dependencies.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update get_powerscale_dependencies.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update get_powerscale_dependencies.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* telemetry backup during provision upgrade and victoria upgrade (#4531)

* telemetry backup during provision

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* delegate to required component

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* correct delegation

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* addressing review comments

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* victoria_upgrade

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* commening out execure_telemetry_sh.j2

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* allow for sinlge control plane

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* UT fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* read k8s version dynamically

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* read k8s version dynamically

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

---------

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* input validation for slot hex values

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Merge pull request #4524 from Venu-p1/dev/upgrade-buildstream-1

feature: Upgrade BuildStream 2.1 to 2.2

* Removed emojis from ansible output

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Update main.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update get_powerscale_dependencies.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Added reboot tracking for successful and failed nodes in upgrade and
rollback

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* etcd on local disk support

Signed-off-by: Narthan_S <narthan.s@dell.com>

* shell scripts modified to mount etcd on disk

Signed-off-by: Narthan_S <narthan.s@dell.com>

* fix(checkmarx): resolve sensitive-log and info-exposure findings in ome_server_inventory

Addresses 7 Checkmarx findings (IDs 33-37, 39, 42) in ome_server_inventory.py:

Filtering_Sensitive_Logs (IDs 33-37):
- Clear self.password from memory immediately after authentication POST
- Pass ome_username/ome_password directly from module.params to OMEClient
  constructor without intermediate local variables
- Breaks Checkmarx data-flow chain from ome_password to logger calls

Information_Exposure_Through_an_Error_Message (IDs 39, 42):
- Log only exception class name (type(exc).__name__) instead of full
  exception string in retry and inventory-fetch warning messages
- Prevents potential exposure of internal paths, IPs, or connection
  details in log output

Tested: prepare_oim and discovery flows re-tested successfully.
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* Fail if ochami env setting failed

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Added enhanced error messgae if cloud-init fails

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Feature branch sync - pub/vast_telemetry - pub/q2_dev (#4539)

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>
Co-authored-by: Nagachandan-P <Nagachandan.p@dell.com>
Co-authored-by: snarthan <narthan.s@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: sujit-jadhav <sujit.jadhav@dell.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>

* VAST telemetry/syslogs enabled (#4501) (#4540)

* VAST telemetry/syslogs enabled



* Added VAST credentials rules



* updated vast telemetry config in upgrade template



---------

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>
Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
Co-authored-by: Nagachandan-P <Nagachandan.p@dell.com>
Co-authored-by: snarthan <narthan.s@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: sujit-jadhav <sujit.jadhav@dell.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>
Co-authored-by: pullan1 <sudha.pullalaravu@dell.com>

* Increased retry interval to 15 seconds

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Updated retries and interval

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* Merge pull request #4544 from Kratika-P/pub/q2_upgrade_latest

upgrade telemetry complete changes along with integration

* template format for csi install

* template format for csi install

* lint fixes

* lint fixes

* Template version of csi installation (#4546)

* Update main.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update get_powerscale_dependencies.yml

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* template format for csi install

* template format for csi install

* lint fixes

* lint fixes

---------

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>
Co-authored-by: Narthan_S <narthan.s@dell.com>

* Modification to Upgrade K8s Logic (#4541)

* rollback for k8s upgrade

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* fixes after UT on rollback k8s

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* logic updated for rollback status file

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* lint fixes

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* fix remaining lint issues

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* reversing rollback changes

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

---------

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* Cloud-init failure message enhanced (#4538)

* Fail if ochami env setting failed

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Added enhanced error messgae if cloud-init fails

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Increased retry interval to 15 seconds

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Updated retries and interval

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

---------

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* Fix integ issues during upgrade. (#4545)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Buildstream skip in upgrade playbook (#4547)

* Update upgrade_build_stream.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update upgrade_build_stream.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Upgrade and rollback fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update upgrade.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* external victoria config update (#4536)

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* upgarde powerscale

* removing redundant code

* command fix

Signed-off-by: Narthan_S <narthan.s@dell.com>

* removing pause

Signed-off-by: Narthan_S <narthan.s@dell.com>

* Openchami rollback from omnia 2.2 to 2.1 (#4542)

* Add Openchami rollback changes from omnia 2.2 to 2.1

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Fix ansible lint issues

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Input transform fixes

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Update omnia_config.j2

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Update ansible-lint.yml

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

---------

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
Signed-off-by: Mithilesh Reddy <mithilesh.reddy@dell.com>

* Fix/catalog k8s (#4548)

* Update service_k8s to 1.35.1 and csi_driver_powerscale to v2.16.0 in catalog software configs

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

* Handle optional K8S and Slurm configs, fix versioned bundle filename parsing

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

* Handle ldms packages in os_* functional layers when those roles exist in pxe.

 Infrastructure packages populated only from csi_driver_powerscale.json

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

* Catalogs regenerated with below changes.

os_x86_64/os_aarch64 functional layers now populated from ldms.json
Infrastructure packages only from csi_driver_powerscale.json

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

* Remove name-based infrastructure package classification fallback

Infrastructure packages now determined solely by bundle membership in csi_driver_powerscale. Removed _is_infra_package_name() fallback logic and updated catalogs accordingly.

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

---------

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

* final commit for upgarde

* scratch mount forlogin nodes

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* drain anad calico fix

Signed-off-by: Narthan_S <narthan.s@dell.com>

* lint fixes

Signed-off-by: Narthan_S <narthan.s@dell.com>

* removing tmp dir mount

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* slurm files reverted

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* login compiler nodes for tmp mount

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Fix to use hapoxy-based endpoint resolution (#4550)

* Fix to use hapoxy-based endpoint resolution

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Update telemetry_storage_config.j2

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

---------

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Fix/k8s catalog 2 (#4552)

* Fix: Updated logic to handle missing K8s and other packages.

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

* Add 'v' prefix to service_k8s versioned filename format

Changed service_k8s filename format from service_k8s_{version}.json to service_k8s_v{version}.json for consistency with versioning conventions.

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

---------

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

* modify step drain PDB logic

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* modify drain logic in workers

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* Add int to step_drain.yml

Signed-off-by: Vrinda Marwah <vrinda.marwah@dell.com>

* Update step_drain.yml

Signed-off-by: Vrinda Marwah <vrinda.marwah@dell.com>

* test commit on step_drain.yml

Signed-off-by: Vrinda Marwah <vrinda.marwah@dell.com>

* fix in step_drain.yml

Signed-off-by: Vrinda Marwah <vrinda.marwah@dell.com>

* Added mounts to login and login compiler
fixed vast_rdma mnt opts in input dir

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* BuildStream Feature Bug Fixes and Upgrade Stabilisation. (#4556)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update set_pxe_boot.yml (#4559)

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* Update openchami_auth.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>


Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Storage_config doc update
ochami error fix

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* cloud-init enhancement on gpu nodes

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Update set_pxe_boot.yml

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* Refactor functional layer generation to use PXE-only architecture mapping (#4565)

* hpc_tools from vast

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Added vast to mount on oim

Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* fix(gitlab): Replace YAML folded URLs with single-line to fix InvalidURL error (#4567)

* Update deploy_openchami.yml

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Update main.yml

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Update push_single_example_catalog.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Update main.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

---------

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Update omnia.sh for selinux fix for external NFS (#4564)

* Update omnia.sh

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Feature branch update (#70)

* cloud-init enhancement on gpu nodes

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Update set_pxe_boot.yml

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* Refactor functional layer generation to use PXE-only architecture mapping (#4565)

* fix(gitlab): Replace YAML folded URLs with single-line to fix InvalidURL error (#4567)

* Update deploy_openchami.yml

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Update main.yml

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Update push_single_example_catalog.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Update main.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

---------

Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

---------

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: Nagachandan-P <Nagachandan.p@dell.com>
Co-authored-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Co-authored-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com>
Co-authored-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: Nagachandan-P <Nagachandan.p@dell.com>
Co-authored-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Co-authored-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com>
Co-authored-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>

* Merge pull request #4568 from abhishek-sa1/pub/q2_dev

Update telemetry_storage_config.yml validation

* Update read_software_config.yml (#4570)

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* fix(discovery): detect IB NIC when iDRAC reports Unknown LinkStatus (OMN01D-2442)

iDRAC may report InfiniBand NIC LinkStatus as 'Unknown' even when the
interface is connected and active at the OS level. The previous logic
in extract_server_info() strictly required LinkStatus=='Up', silently
skipping these NICs and leaving IB_NIC_NAME and IB_IP empty in the
PXE mapping file.

Add prioritized fallback selection for IB NIC detection:
  1. Up      — selected immediately (no change)
  2. Unknown — preferred fallback when no Up port exists
  3. Down/other — last resort, first port at this tier wins

This mirrors the existing ethernet NIC fallback pattern (lines 436-465)
and ensures InfiniBand NICs are populated in the PXE mapping even when
iDRAC misreports their status.

Add 12 unit tests covering all priority combinations.

Fixes: OMN01D-2442
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* adding secrets and values file

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* Fix/missing csi and docker.io/victoriametrics/operator (#4572)

* Fix image package deduplication by using tag-aware keys and update CSI filter type to substring.

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

* Refactor package deduplication to use tag/version-aware keys and merge duplicate entries

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

---------

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

* Fix checkmarx issues

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* vector-ome changes (#4569)

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* Update deploy_powerscale_csi.sh.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update credential_rules.json (#4577)

Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>

* update template

Signed-off-by: mcas <sakshi.s@dell.com>

* Update omnia_config.json

Signed-off-by: snarthan <narthan.s@dell.com>

* powerscale changes

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* powerscale backup changes

Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>

* Fix to execute rhel subscription validation  when 'local_repo' is explicitly present in omnia_run_tags (#4574)

* Update deploy_powerscale_csi.sh.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update deploy_powerscale_csi.sh.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Upgrade and Rollback changes

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* Update mount_on_oim.yml

Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>

* signoff last commit (#4589)

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Update ci-group-slurm_node_aarch64.yaml.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Refactor Gitlab configuration in Upgrade (#4576)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Upgrade and rollback more error scenarios
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Skipping validation and upgrade for service_k8s if not present in software_config json (#4597)

* Fix to execute rhel subscription validation  when 'local_repo' is explicitly present in omnia_run_tags

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>

* Added vast_telemetry run tag

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>

* Skipping validation and upgrade for service_k8s if not present in software_config json

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>

---------

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>

* Sonarqube scan fixes (#4596)

* sonar cube update

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Fixing sonarqube issue

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Merge pull request #4598 from mithileshreddy04/q2_rollback_fix

Idempotency fixes and backup modification for openCHAMI upgrade and rollback

* Add rollback code for k8s

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* lint fixes

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* fix: vector-ome and idrac pods not coming up issue (#4591)

* vector-ome changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* defect fix for vector-ome and idrac pods not initialized

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* lint-fix

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

---------

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* resource limits for idrac telemtry containers (#4590)

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* updating pdb code and version for csi

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* updated

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* skip k8s rollback when service k8s is not enabled

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* Increase job wait timeout for build image to 2 hours (#4594)

* Increase job wait timeout

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* build image fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* If no slurm nodes - ending play instead of fail
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Changes to mount hpc_tools to vast

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Added comments about vast storage

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Cleanup stale file handle error
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Fix checkmarx vulnerabilities (#4611)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Feature - BuildStream Rollback (2.2 -> 2.1) (#4610)

* Fix checkmarx issues. (#4612)

* Merge pull request #4618 from VrindaMarwah/pub/q2_upgrade

Increase pod status timeout in K8s rollback

* Create readable pkg ids in Catalog (#4617)

* Replace sequential package IDs with human-readable identifiers in catalog generation
using format: {sanitized_name}_{version}_{type} or {sanitized_name}_{version}_{type}_{counter}

- Implement collision detection and handling with counter suffix when duplicate IDs occur
- Extract version information from package names for pip modules (name==version format) and RPMs

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

* use 'na' if version is not available.

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

---------

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

* Add input config diff test & tool for comp aring expected vs actual build stream (adapter) outputs (#4586)

* Add input config diff test & tool for comparing expected vs actual build stream (adapter) outputs

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

* Updated example path

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

---------

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

* Merge pull request #4614 from balajikumaran-c-s/pub/q2_dev

fix: Use NFS_SHARE_PATH for artifact_dir validation and rename discovery scenario to provision

* feat(discovery): add BMC discovery report with NIC link statuses

Generate a BMC discovery report CSV alongside the PXE mapping file during
OME server discovery. The report is written to /opt/omnia/discovery/ with
the same timestamp as the PXE mapping file.

Report columns:
  SERVICE_TAG, BMC_MAC, BMC_IP, BMC_NIC_STATUS,
  ETHERNET_NIC_MAC, ETHERNET_NIC_LINK_STATUS,
  IB_NIC_NAME, IB_NIC_LINK_STATUS

Changes:
- ome_server_inventory.py: enrich extract_server_info() to return
  idrac_link_status, first_nic_link_status, and ib_nic_link_status
- generate_discovery_report.py: new Ansible module that writes the
  discovery report CSV from the enriched server inventory data
- generate_discovery_report.yml: new task file that creates the
  /opt/omnia/discovery/ directory and invokes the report module
- main.yml: add generate_discovery_report task after PXE mapping
- vars/main.yml: add discovery_report_dir and discovery_report_file vars
- generate_pxe_mapping.yml: move completion messages to
  generate_discovery_report.yml so the report path is available
- test_generate_discovery_report.py: 7 unit tests covering headers,
  empty servers, all fields, missing IB, multiple servers, nested dirs,
  and return values

Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* Merge pull request #4620 from mithileshreddy04/q2_upgrade_fixes

Update prepare_upgrade.yml

* telemetry rollback and upgrade changes (#4613)

* telemetry rollback and upgrade changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* rollback and upgrade comments fixes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* changing component and tag name from k8s -> k8s-telemetry

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* lint

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

---------

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* Updating oim host group in upgrade local repo flow (#4625)

* Updating podman excutable path

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* increase retries

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* local repo oim host fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Revert "Updating podman excutable path"

This reverts commit 9024f8a795aa62ecdd2bb06c9eaf5cc990760e26.

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Merge pull request #4624 from pullan1/pub/q2_dev

pulp publication issue fix

* Latest input parameter transformation changes for prepare_upgrade.yml flow (#4628)

* Update input file migration logic to latest input file format

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Update prepare_upgrade.yml

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Update omnia_config.j2

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

---------

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* mpi jobs with doca compatible ucx

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* changing the sdk installation

Signed-off-by: mcas <sakshi.s@dell.com>

* Upgrade omina_config import
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* changing the export

Signed-off-by: mcas <sakshi.s@dell.com>

* Fix incorrect pipeline execution by fixing the order of trigger files followed by pipeline yml files. (#4632)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Input doc update
upgrade slurm backup updated

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* slurm_backup location update
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Slurm backup of conf and mysql
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* fix(discovery): exclude IB NIC from ADMIN_MAC and default empty LinkStatus to Unknown

Bug 1: ADMIN_MAC picking InfiniBand MAC
- Root cause: Ethernet NIC search only excluded iDRAC NICs, not InfiniBand NICs
- When all Ethernet NICs had UNKNOWN status, the fallback picked an IB NIC MAC
- Fix: Add INFINIBAND filter to both primary and deviceNics fallback search

Bug 2: Missing LINK STATUS for UNKNOWN NICs in discovery report
- Root cause: null/empty LinkStatus defaulted to empty string
- Fix: Default to 'Unknown' in all 5 LinkStatus fallback expressions

Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* Create setup_doca_mpi_env.sh.j2 for environment setup of mpi

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update main.yml (#4637)

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Better logging visibility (#4639)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* rollback and upgrade formattign and skipped issues fixed
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Telemetry upgrade check updated based in service_k8s present (#4638)

* telemetry rollback and upgrade changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* rollback and upgrade comments fixes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* changing component and tag name from k8s -> k8s-telemetry

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* lint

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* upgrade telemetry refinement changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* skip and end play tsks updated

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

---------

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* build image selinux fix for aarch64 and x86_64 (#4640)

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Fix for bss and cloudinit update for service_kube_control_plane_x86_64 and display banner message  (#4645)

* add code for banner fix

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* Fix incorrect pipeline execution by fixing the order of trigger files followed by pipeline yml files. (#4632)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* fix(discovery): exclude IB NIC from ADMIN_MAC and default empty LinkStatus to Unknown

Bug 1: ADMIN_MAC picking InfiniBand MAC
- Root cause: Ethernet NIC search only excluded iDRAC NICs, not InfiniBand NICs
- When all Ethernet NICs had UNKNOWN status, the fallback picked an IB NIC MAC
- Fix: Add INFINIBAND filter to both primary and deviceNics fallback search

Bug 2: Missing LINK STATUS for UNKNOWN NICs in discovery report
- Root cause: null/empty LinkStatus defaulted to empty string
- Fix: Default to 'Unknown' in all 5 LinkStatus fallback expressions

Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* Upgrade omina_config import
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Input doc update
upgrade slurm backup updated

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* slurm_backup location update
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Slurm backup of conf and mysql
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Update main.yml (#4637)

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Create setup_doca_mpi_env.sh.j2 for environment setup of mpi

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Better logging visibility (#4639)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* fix for setting the bss and cloudinit for service kube control plane when additional cp are present

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* fix: resolve yaml linting errors in upgrade.yml

- Fix line length issue on line 502 (split long line)
- Remove trailing spaces on line 524

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

---------

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: sujit-jadhav <sujit.jadhav@dell.com>
Co-authored-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>
Co-authored-by: Nagachandan P <Nagachandan.p@dell.com>

---------

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>
Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
Signed-off-by: snarthan <narthan.s@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Signed-off-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
Signed-off-by: SOWJANYAJAGADISH123 <sowjanya.jagadish@dell.com>
Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>
Signed-off-by: Narthan_S <narthan.s@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Vrinda_Marwah <Vrinda.Marwah@dell.com>
Signed-off-by: Mithilesh Reddy <mithilesh.reddy@dell.com>
Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>
Signed-off-by: Vrinda Marwah <vrinda.marwah@dell.com>
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>
Signed-off-by: mcas <sakshi.s@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Co-authored-by: Nagachandan-P <Nagachandan.p@dell.com>
Co-authored-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>
Co-authored-by: Sujit Jadhav <sujit.jadhav@dell.com>
Co-authored-by: sakshi-singla-1735 <sakshi.s@dell.com>
Co-authored-by: Mithilesh Reddy <mithilesh.reddy@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com>
Co-authored-by: snarthan <narthan.s@dell.com>
Co-authored-by: pullan1 <sudha.pullalaravu@dell.com>
Co-authored-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Co-authored-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
Co-authored-by: SOWJANYAJAGADISH123 <Sowjanya.Jagadish@dell.com>
Co-authored-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com>
Co-authored-by: Vrinda Marwah <vrinda.marwah@dell.com>
Co-authored-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Co-authored-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Co-authored-by: Katakam-Rakesh <katakam.rakesh@dell.com>
abhishek-sa1 added a commit that referenced this pull request Jun 4, 2026
* Merge pull request #4605 from abhishek-sa1/pub/q2_ansible

Ansible core 2.20 support for omnia 2.2 release

* Add catalog generator documentation.

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

* Create setup_doca_mpi_env.sh.j2 for environment setup of mpi

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update main.yml (#4637)

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Better logging visibility (#4639)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* rollback and upgrade formattign and skipped issues fixed
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Telemetry upgrade check updated based in service_k8s present (#4638)

* telemetry rollback and upgrade changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* rollback and upgrade comments fixes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* changing component and tag name from k8s -> k8s-telemetry

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* lint

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* upgrade telemetry refinement changes

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* skip and end play tsks updated

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

---------

Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>

* build image selinux fix for aarch64 and x86_64 (#4640)

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Fix for bss and cloudinit update for service_kube_control_plane_x86_64 and display banner message  (#4645)

* add code for banner fix

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* Fix incorrect pipeline execution by fixing the order of trigger files followed by pipeline yml files. (#4632)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* fix(discovery): exclude IB NIC from ADMIN_MAC and default empty LinkStatus to Unknown

Bug 1: ADMIN_MAC picking InfiniBand MAC
- Root cause: Ethernet NIC search only excluded iDRAC NICs, not InfiniBand NICs
- When all Ethernet NICs had UNKNOWN status, the fallback picked an IB NIC MAC
- Fix: Add INFINIBAND filter to both primary and deviceNics fallback search

Bug 2: Missing LINK STATUS for UNKNOWN NICs in discovery report
- Root cause: null/empty LinkStatus defaulted to empty string
- Fix: Default to 'Unknown' in all 5 LinkStatus fallback expressions

Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>

* Upgrade omina_config import
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Input doc update
upgrade slurm backup updated

Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* slurm_backup location update
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Slurm backup of conf and mysql
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>

* Update main.yml (#4637)

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Create setup_doca_mpi_env.sh.j2 for environment setup of mpi

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-slurm_node_x86_64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update ci-group-login_compiler_node_aarch64.yaml.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Better logging visibility (#4639)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* fix for setting the bss and cloudinit for service kube control plane when additional cp are present

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* fix: resolve yaml linting errors in upgrade.yml

- Fix line length issue on line 502 (split long line)
- Remove trailing spaces on line 524

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

---------

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: sujit-jadhav <sujit.jadhav@dell.com>
Co-authored-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>
Co-authored-by: Nagachandan P <Nagachandan.p@dell.com>

* ansible 2.20 fixes

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* lint update

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update OME Discovery completion message for BuildStream workflow

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Added skip logic for rollback_slurm
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Update install_dcgm.sh.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* upgrade defect fixes (#4641)

* upgrade defects fixes and fix for crashloopback on pod restart

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* remove stale services and deployments for victoria

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* revert changes as it si taken care in another Pr

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* revert idrac terminationgraceperiod

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* ansible lint fixes

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

---------

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>

* Update install_dcgm.sh.j2

Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>

* Delegate manifest to localhost
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Merge pull request #4649 from mithileshreddy04/q2_upgrade_rollback_fixes

Upgrade and rollback fixes

* oim cleanup issue fixed for scratch dir

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* lint issue fixed

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* Validation check for pxe mapping file and cluster initialised check and banner preview (#4655)

* added banner changes and validation of pxemapping file for software presence and cluster initialized file in cloud-init-log

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* lint fix

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

---------

Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>

* Update slurm_custom.json

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Update slurm_custom.json

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Upgrade backup moved from upgrade to provision
also updated doc in input/omnia_config.yml
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Update cleaned images via OIM cleanup to 'CLEANED' status (#4657)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the Image_Groups table

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Catalog update

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* ib ip port matching enhanced logic

Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>

* slurm duplicate dir fix
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Update software_utils.py

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Upgrade and rollback defect fixes (#4661)

Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>

* Slurm backup during upgrade_provision rather than upgrade_slurm & omnia_config comments (#4660)

* Upgrade backup moved from upgrade to provision
also updated doc in input/omnia_config.yml
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* slurm duplicate dir fix
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Fix for issue oim_metadata file reading
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Fix for issue oim_metadata read error (#4664)

* Upgrade backup moved from upgrade to provision
also updated doc in input/omnia_config.yml
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* slurm duplicate dir fix
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Fix for issue oim_metadata file reading
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Replace the hardcoded user for Postgres user (#4665)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the Image_Groups table

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Catalog update

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Replace the hardcoded postgres user

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* telemetry mysql condition update

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Slurm added chcek for non idle nodes and timeout of reboot increased to
20 minutes from 10
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Output format imroved for non oidel nodes message
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>

* Merge pull request #4669 from mithileshreddy04/q2_upgrade_new_fixes

Remove version.yml and fix openchami backup manifest

* Restore SELinux policy fix task for aarch64 (#4668)

Reintroduced pre-flight SELinux policy fix for aarch64 node.

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Update configure-ib-network.sh.j2

Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>

* Fix for upgarde is failing in localrepo when omnia_config_credential.yml file is decrypted

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>

* Fixing ansible 2.20 issues in upgrade and rollback flow (#4673)

* ansible 2.20 upgrade fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* issue fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* upgrade fix

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update restore_user_registry_credential.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Update restore_omnia_config_credentials.yml

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* Simplify ID format to use package name only (version stripped) instead of {name}_{version}_{type}. Adding unit tests for id generation function (#4672)

* Simplify ID format to use package name only (version stripped) instead of {name}_{version}_{type}. Adding unit tests for id generation function

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

* Adding copyright

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

---------

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

* Fix the incorrect pipeline status in Gitlab (#4676)

* Upgrade gitlab config and Pipeline as part of BuildStream 2.1 to 2.2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the upgrade and upgrade_build_stream playbooks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fixing lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Modularize the gitlab tasks under upgrade_build_stream.yml playbook

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Move relevant tasks

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix integration issues during upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* BuildStream Feature Bug fixes and Upgrade Stabilisation

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix lint issues and review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Removed unused methods

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Refactor Gitlab configuration in Upgrade

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix upgrade validation, summary paths, lint issues, and validate stage log_file_path

- Fix validation: only abort if enable_build_stream was true in 2.1 backup AND false in current config
- Fix summary: resolve backup_dir to actual path using source_version instead of Jinja template
- Fix 3 yaml line-length lint failures (gitlab_ci_file.yml, gitlab_example_catalog.yml, gitlab_input_file.yml)
- Fix missing log_file_path for validate stage: add NFS log file creation in playbook watcher execute_molecule() to match other stages

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Remove buildstream directories as part of cleanup

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Address review comments

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix documentation for discover.yml

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues2

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fic checkmarx issues3

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the checkmarx issues4

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix checkmarx issues5

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the order of trigger files followed by pipeline to avoid incorrect pipelines execution

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Add ci skip tags

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Better logging visibility

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Update the Image_Groups table

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Catalog update

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Replace the hardcoded postgres user

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

* Fix the incorrect pipeline status in Gitlab

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>

---------

Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: Rajeshkumar S <rajeshkumar.s2@dell.com>
Signed-off-by: Kratika.Patidar <kratika.patidar@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Katakam-Rakesh <katakam.rakesh@dell.com>
Signed-off-by: sujit-jadhav <sujit.jadhav@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>
Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
Co-authored-by: venu <236371043+Venu-p1@users.noreply.github.com>
Co-authored-by: Nagachandan P <Nagachandan.p@dell.com>
Co-authored-by: Kratika Patidar <Kratika.Patidar@dell.com>
Co-authored-by: snarthan <narthan.s@dell.com>
Co-authored-by: Rajeshkumar-s2 <rajeshkumar.s2@dell.com>
Co-authored-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Co-authored-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Co-authored-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com>
Co-authored-by: sujit-jadhav <sujit.jadhav@dell.com>
Co-authored-by: Jagadeesh N V <jagadeesh.n.v@dell.com>
Co-authored-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Co-authored-by: sakshi-singla-1735 <sakshi.s@dell.com>
Co-authored-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
Co-authored-by: Mithilesh Reddy <mithilesh.reddy@dell.com>
Co-authored-by: pullan1 <sudha.pullalaravu@dell.com>
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.

8 participants