Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRAYSAT-1875: Add new HSM types to sat status #302

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

annapoorna-s-alt
Copy link
Contributor

@annapoorna-s-alt annapoorna-s-alt commented Dec 12, 2024

Summary and Scope

Add new HSM Types, namely CabinetPDU, CabinetPDUController, CabinetPDUPowerConnector and
MgmtSwitch in sat status

Issues and Related PRs

List and characterize relationship to Jira/Github issues and other pull requests. Be sure to list dependencies.

Testing

List the environments in which these changes were tested.

Tested on:

  • Odin

Test description:

How were the changes tested and success verified? If schema changes were part of this change, how were those handled in your upgrade/downgrade testing?

Tested with sat status command for all the types including CabinetPDU, CabinetPDUController, CabinetPDUPowerConnector and MgmtSwitch

Risks and Mitigations

Low

Pull Request Checklist

  • Version number(s) incremented, if applicable
  • Copyrights updated
  • License file intact
  • Target branch correct
  • CHANGELOG.md updated
  • Testing is appropriate and complete, if applicable
  • HPC Product Announcement prepared, if applicable

@annapoorna-s-alt
Copy link
Contributor Author

@annapoorna-s-alt annapoorna-s-alt marked this pull request as ready for review December 13, 2024 11:09
CHANGELOG.md Outdated Show resolved Hide resolved
@annapoorna-s-alt annapoorna-s-alt force-pushed the CRAYSAT-1875-add-new-hsm-types branch from 8d4f0df to f66940d Compare December 18, 2024 05:46
@annapoorna-s-alt annapoorna-s-alt merged commit 69f4bf6 into main Dec 18, 2024
3 checks passed
@annapoorna-s-alt annapoorna-s-alt deleted the CRAYSAT-1875-add-new-hsm-types branch December 18, 2024 05:53
@annapoorna-s-alt
Copy link
Contributor Author

annapoorna-s-alt commented Dec 18, 2024

/backport release/3.33

Copy link

Error occured while backporting into branch release/3.32.

Error
git -c user.name="annapoorna-s-alt" -c user.email="[email protected]" cherry-pick f66940da79f8f2829922269f85d3f9edad207e7a -x
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md

error: could not apply f66940d... CRAYSAT-1875: Add new HSM types to sat status
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@annapoorna-s-alt
Copy link
Contributor Author

/backport release/3.33

Copy link

Backporting into branch release/3.33 was successful. New PR: #305

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