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

CASMTRIAGE-7185: Add Power Off Management Cabinets procedure #5254

Merged
merged 6 commits into from
Aug 6, 2024

Conversation

haroldlongley
Copy link
Contributor

Description

CASMTRIAGE-7185: Add Power Off Management Cabinets procedure

  • If I added any command snippets, the steps they belong to follow the prompt conventions (see [example][1]).
  • If I added a new directory, I also updated .github/CODEOWNERS with the corresponding team in [Cray-HPE][2].
  • My commits or Pull-Request Title contain my JIRA information, or I do not have a JIRA.

Copy link

@sfkramer sfkramer left a comment

Choose a reason for hiding this comment

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

Your changes look good!

@rustydb rustydb merged commit 4fbabee into release/1.4 Aug 6, 2024
8 checks passed
@rustydb rustydb deleted the CASMTRIAGE-7185 branch August 6, 2024 19:01
@haroldlongley
Copy link
Contributor Author

/backport release/1.5
/backport release/1.6

Copy link
Contributor

Error occured while cloning repo https://github.com/Cray-HPE/docs-csm.git.

Error
git -c "http.https://github.com.extraheader=Authorization: basic eC1hY2Nlc3MtdG9rZW46Z2hzXzZ3cnFGbWpyT0hoUW9XVTF2T2JJMG0xNjMwbGlMTTNSeUdPMQ==" fetch --depth=1 origin release/1.5/backport release/1.6

fatal: couldn't find remote ref release/1.5/backport

Copy link
Contributor

Error occured while backporting into branch release/1.5/backport.

Error
git checkout -b backport/5254-to-release/1.5/backport -t origin/release/1.5/backport

fatal: 'origin/release/1.5/backport' is not a commit and a branch 'backport/5254-to-release/1.5/backport' cannot be created from it

Copy link
Contributor

Error occured while backporting into branch release/1.6.

Error
git show df463872600b859a51eeb3d8acb19160a00152eb --compact-summary

fatal: bad object df463872600b859a51eeb3d8acb19160a00152eb

@haroldlongley
Copy link
Contributor Author

@rustydb how do I get this backported? I haven't done it in a while.

@rustydb
Copy link
Contributor

rustydb commented Aug 20, 2024

@haroldlongley are you asking how to do it offline?
The plug-in failed, so it'll have to be an offline/manual backport.
If you want advice for doing it offline I can lend a hand.

@rustydb
Copy link
Contributor

rustydb commented Aug 20, 2024

Perhaps it was the syntax you used, the branches should be enumerated on a single line. let me try again.

@rustydb
Copy link
Contributor

rustydb commented Aug 20, 2024

/backport release/1.5 release/1.6

Copy link
Contributor

Error occured while backporting into branch release/1.5.

Error
git -c user.name="Harold Longley" -c user.email="harold.longley@hpe.com" cherry-pick df463872600b859a51eeb3d8acb19160a00152eb -x
Auto-merging operations/power_management/Shut_Down_and_Power_Off_the_Management_Kubernetes_Cluster.md
Auto-merging operations/power_management/System_Power_Off_Procedures.md
CONFLICT (content): Merge conflict in operations/power_management/System_Power_Off_Procedures.md

error: could not apply df463872... CASMTRIAGE-7185: Add Power Off Management Cabinets procedure
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"

Copy link
Contributor

Error occured while backporting into branch release/1.6.

Error
git checkout -b backport/5254-to-release/1.6 -t origin/release/1.6
operations/power_management/System_Power_Off_Procedures.md: needs merge

error: you need to resolve your current index first

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.

4 participants