Skip to content

Conversation

@Shreejit-03
Copy link
Contributor

@Shreejit-03 Shreejit-03 commented Nov 3, 2025

Implementation

  • Switched from rt_target_IP to ssh_connection for direct RT target access.
  • Updated automation_conf.json and JsonConfig to use ssh_connection.
  • Refactored build_and_test to pass ssh_connection into install_and_test_image.
  • Normalized merge report key to "Push and PR".
  • Added ni/rtos team tag in PR descriptions for quicker reviewer visibility.
  • Adjusted clean script path to clean.core-feeds_and_core-images.sh (skip_merge scenario compatible).
  • Updated README to reflect SSH changes.

Justification

AB#3174387

Testing

Azure DevOps pipeline run completed successfully.

PRs were auto-created:

Mail report was generated and sent successfully.

@pratheekshasn
@rajendra-desai-ni

@Shreejit-03 Shreejit-03 force-pushed the nilrt/master/scarthgap branch from f03398a to 4cc4908 Compare November 3, 2025 09:14
- **`rt_target_IP`**:
The IP address or hostname of the RT target where images will be installed and tested via SSH.
- **`ssh_connection`**:
The SSH connection of the RT target where images will be installed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can give a usage example something like: [username]@[hostname or IP address]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have made those changes.

current_dir = os.getcwd()
push_and_pr_results = {}
for git_obj, (status, message) in list(merge_report.items()):
if status == 0 and message is not None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't os.chdir(git_obj.local_repo) meant to cd to the absolute path of the submodule? If that's the case, you won't need to keep switching back to the current_dir at the end of every iteration.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the final PR is created, the working directory should return to the nilrt directory.

@pratheekshasn
Copy link
Contributor

You might want to change the PR title and the commit message. Do add some more detail in the commit message after the title.

@Shreejit-03 Shreejit-03 force-pushed the nilrt/master/scarthgap branch from ff5215f to fc3545d Compare November 6, 2025 06:07
@Shreejit-03 Shreejit-03 changed the title Updated Automating upstream merge files Refine automation with SSH and improve PR descriptions Nov 6, 2025
@Shreejit-03 Shreejit-03 force-pushed the nilrt/master/scarthgap branch from fc3545d to d294121 Compare November 6, 2025 06:39
@Shreejit-03 Shreejit-03 changed the title Refine automation with SSH and improve PR descriptions [Upstream merge automation] Added details to PR description + code clean up Nov 6, 2025
@Shreejit-03 Shreejit-03 changed the title [Upstream merge automation] Added details to PR description + code clean up [UpstreamMergeAutomation] Added details to PR description + clean up Nov 6, 2025
@Shreejit-03 Shreejit-03 force-pushed the nilrt/master/scarthgap branch 2 times, most recently from 9c1a60c to 6af5773 Compare November 7, 2025 10:58
Refined upstream merge automation by enhancing PR descriptions and
cleaning up code. Removed hard-coded email IDs from configuration file.

Signed-off-by: Shreejit-03 <shreejit.c@emerson.com>
@Shreejit-03 Shreejit-03 force-pushed the nilrt/master/scarthgap branch from 6af5773 to bd480cd Compare November 11, 2025 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants