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

CASMINST-6426 Update openssl command #5564

Merged
merged 1 commit into from
Dec 3, 2024
Merged

CASMINST-6426 Update openssl command #5564

merged 1 commit into from
Dec 3, 2024

Conversation

rustydb
Copy link
Contributor

@rustydb rustydb commented Nov 25, 2024

Description

This command is only copy-paste friendly internally, but it no longer works as of ~2023.

Updates the command example for easier internal usage.

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.

This command is only copy-paste friendly internally, but it no longer
works as of ~2023.

Updates the command example for easier internal usage.
@rustydb
Copy link
Contributor Author

rustydb commented Nov 25, 2024

/backport release/1.5 release/1.4 release/1.3 release/1.2 release/1.0 release/0.9

Copy link
Contributor

Backporting into branch release/1.5 was successful. New PR: #5565

Copy link
Contributor

Backporting into branch release/1.4 was successful. New PR: #5566

Copy link
Contributor

Backporting into branch release/1.3 was successful. New PR: #5567

Copy link
Contributor

Error occured while backporting into branch release/1.2.

Error
git -c user.name="Russell Bunch" -c user.email="[email protected]" cherry-pick 10206409ca7be9f35e6de82e797d3ce1ff8ac15c -x
Auto-merging install/prepare_site_init.md
CONFLICT (content): Merge conflict in install/prepare_site_init.md

error: could not apply 1020640... CASMINST-6426 Update openssl command
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.0.

Error
git checkout -b backport/5564-to-release/1.0 -t origin/release/1.0
install/prepare_site_init.md: needs merge

error: you need to resolve your current index first

Copy link
Contributor

Error occured while backporting into branch release/0.9.

Error
git checkout -b backport/5564-to-release/0.9 -t origin/release/0.9
install/prepare_site_init.md: needs merge

error: you need to resolve your current index first

@rustydb
Copy link
Contributor Author

rustydb commented Nov 25, 2024

Ignoring the backports into 1.2 and older because those releases do not have examples of signed certs.

@rustydb rustydb merged commit e161b02 into release/1.6 Dec 3, 2024
8 checks passed
@rustydb rustydb deleted the CASMINST-6426 branch December 3, 2024 17:34
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