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

openssh_keypair tests: explicitly tell ssh-keygen to use RSA #662

Merged
merged 1 commit into from
Oct 7, 2023

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Latest OpenSSH's ssh-keygen apparently defaults to ed25519 keys, no longer RSA. This causes the openssh_keypair tests to fail on Arch Linux.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

openssh_keygen

@felixfontein felixfontein merged commit e751558 into ansible-collections:main Oct 7, 2023
127 of 128 checks passed
@patchback
Copy link

patchback bot commented Oct 7, 2023

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply e751558 on top of patchback/backports/stable-1/e7515584b1734ebea6537d5e53f82a5fdc9b344a/pr-662

Backporting merged PR #662 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.crypto.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/e7515584b1734ebea6537d5e53f82a5fdc9b344a/pr-662 upstream/stable-1
  4. Now, cherry-pick PR openssh_keypair tests: explicitly tell ssh-keygen to use RSA #662 contents into that branch:
    $ git cherry-pick -x e7515584b1734ebea6537d5e53f82a5fdc9b344a
    If it'll yell at you with something like fatal: Commit e7515584b1734ebea6537d5e53f82a5fdc9b344a is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e7515584b1734ebea6537d5e53f82a5fdc9b344a
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR openssh_keypair tests: explicitly tell ssh-keygen to use RSA #662 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/e7515584b1734ebea6537d5e53f82a5fdc9b344a/pr-662
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the fix-test branch October 7, 2023 13:15
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.

1 participant