Skip to content

Feature branch sync - pub/q2 upgrade to staging#4726

Merged
abhishek-sa1 merged 113 commits into
stagingfrom
pub/q2_upgrade
Jun 10, 2026
Merged

Feature branch sync - pub/q2 upgrade to staging#4726
abhishek-sa1 merged 113 commits into
stagingfrom
pub/q2_upgrade

Conversation

@abhishek-sa1

Copy link
Copy Markdown
Collaborator

Feature branch sync - pub/q2 upgrade to staging

abhishek-sa1 and others added 30 commits May 30, 2026 11:33
Ansible core 2.20 support for omnia 2.2 release
Feature branch sync - pub/q2_upgrade to pub/q2_ansible
Feature branch sync - pub/q2_upgrade to pub/q2_ansible
Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com>
Feature branch sync - pub/q2_upgrade to pub/q2_ansible
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Feature branch sync - pub/q2_upgrade to pub/q2_ansible
Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Local repo update for subscription fix with python 3.13 update
Feature branch sync - pub/q2_ansible to pub/q2_upgrade
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
ib ip port matching enhanced logic
…yml file is decrypted

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
* 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>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Fix for upgarde is failing in localrepo when omnia_config_credential.yml file is decrypted
…d 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>
* 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: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
abhishek-sa1 and others added 27 commits June 8, 2026 21:08
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
* kernel 10.2 fix

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

* remove duplicate kernel check

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

* Update validate_image.yml

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

* Update validate_image.yml

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

---------

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

Backup permission issue fix and recheck logic addition for rollback openchami
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
* kernel 10.2 fix

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

* remove duplicate kernel check

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

* Update validate_image.yml

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

* Update validate_image.yml

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

* local repo fix

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

* pip fix

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

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Nagachandan-P <Nagachandan.p@dell.com>
…-2517)

When running discovery.yml without prior prepare_oim.yml execution,
the playbook previously failed with a hard error instructing users
to run prepare_oim.yml first.

Now discovery.yml invokes the standard credential utility
(get_config_credentials.yml) before the discovery role runs. This
reuses the existing credential prompting framework that handles:
- Creating credential files if they don't exist
- Prompting for OME username/password (conditional_mandatory)
- Encrypting credentials with ansible-vault

The discovery config is loaded early to set enable_bmc_discovery
before the credential utility runs, ensuring OME credentials are
prompted when BMC discovery is enabled.

This is consistent with how prepare_oim.yml and other Omnia
playbooks handle credentials.

Fixes: OMN01D-2517
Signed-off-by: Sujit Jadhav <sujit.jadhav@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Nagachandan P <Nagachandan.p@dell.com>
…al-prompt

fix(discovery): prompt for OME credentials when not available
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Pulp cleanup fix and disable ansible warning and task failures
Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
…led is true (OMN01D-2533) (#4720)

The Python heredoc (<<'PYEOF') used for patching CoreDNS ConfigMap
had content at column 0 (import sys, yaml, etc.), which prematurely
terminated the outer YAML literal block scalar (content: |). This
caused ochami cloud-init group set to fail with:
  'yaml: line 1363: could not find expected :'

Replace the heredoc with python3 -c '...' where all lines are
properly indented (12 spaces) to stay within the YAML content: |
block. Python treats the consistent leading whitespace as base-level
indentation, so the code executes correctly.

Fixes: OMN01D-2533

Signed-off-by: Sujit Jadhav <sujit.jadhav@dell.com>
Signed-off-by: Kratika_Patidar <Kratika.Patidar@dell.com>
Signed-off-by: mithileshreddy04 <mithilesh.reddy@dell.com>
-------------
increased reboot timeout for slurm login_compiler_* in rollback
restoring slurm conf fro rollback
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: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Rollback: Fixed reading of build_stream_terminal for slurm
* localrepo checkmarx fixes

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

* Checkmarx fixes

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

* vast metrics relabeling fix

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

* ansible 2.20 fixes

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

---------

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
Comment thread common/library/module_utils/local_repo/download_image.py Dismissed
@abhishek-sa1 abhishek-sa1 marked this pull request as ready for review June 10, 2026 07:06
@abhishek-sa1 abhishek-sa1 merged commit b706374 into staging Jun 10, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.