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-7577: Update to add cray-spire-jwks #5593

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Conversation

ndavidson-hpe
Copy link
Contributor

Description

Update the power up procedure to include checking for cray-spire-jwks errors, not just spire-jwks.

Checklist

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

@ndavidson-hpe
Copy link
Contributor Author

/backport release/1.5

Copy link
Contributor

github-actions bot commented Dec 9, 2024

Error occured while backporting into branch release/1.5.

Error
git -c user.name="Nicholas Davidson" -c user.email="nicholas.davidson@hpe.com" cherry-pick 6496deacc72e53cbdacaa280b75ed89eb640b040 -x
Auto-merging operations/power_management/Power_On_and_Start_the_Management_Kubernetes_Cluster.md
CONFLICT (content): Merge conflict in operations/power_management/Power_On_and_Start_the_Management_Kubernetes_Cluster.md

error: could not apply 6496dea... CASMTRIAGE-7577: Update to add cray-spire-jwks
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"

@mtupitsyn mtupitsyn merged commit b0ebab6 into release/1.6 Dec 18, 2024
8 checks passed
@mtupitsyn mtupitsyn deleted the CASMTRIAGE-7577 branch December 18, 2024 00:22
Srinivas-Anand-HPE pushed a commit that referenced this pull request Dec 20, 2024
* CASMTRIAGE-7577: Update to add cray-spire-jwks

* Update example to better reflect real life
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