Skip to content

Feature branch sync - pub/q2_upgrade to staging#4670

Merged
abhishek-sa1 merged 15 commits into
stagingfrom
pub/q2_upgrade
Jun 4, 2026
Merged

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

Conversation

@abhishek-sa1

Copy link
Copy Markdown
Collaborator

Feature branch sync - pub/q2_upgrade to staging

jagadeeshnv and others added 15 commits June 3, 2026 15:50
also updated doc in input/omnia_config.yml
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>
* 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>
* 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>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
20 minutes from 10
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Signed-off-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Slurm fixed check for non idle nodes and timeout of reboot increased to 20 minutes
Remove version.yml and fix openchami backup manifest
Reintroduced pre-flight SELinux policy fix for aarch64 node.

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
@abhishek-sa1 abhishek-sa1 marked this pull request as ready for review June 4, 2026 05:20
@abhishek-sa1 abhishek-sa1 merged commit 141a190 into staging Jun 4, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants