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

Update signing key name #956

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Update signing key name #956

merged 2 commits into from
Nov 23, 2023

Conversation

hstct
Copy link
Contributor

@hstct hstct commented Nov 20, 2023

[noissue]

@hstct
Copy link
Contributor Author

hstct commented Nov 20, 2023

I used this occasion to update the test data with the new signing key as well. Since it probably will cause some confusion later on if we don't :)

@hstct hstct added the [noissue] For PRs with [noissue] in the commit message. (Change won't appear in the changelog). label Nov 20, 2023
@hstct
Copy link
Contributor Author

hstct commented Nov 20, 2023

We need to backport this as well probably best to just update alle the branches with it

@hstct hstct force-pushed the update-signing-key-name branch from 3107fcf to d743035 Compare November 20, 2023 13:09
@quba42 quba42 marked this pull request as draft November 20, 2023 14:20
GPG_KEY_ID="Pulp QE"
GPG_KEY_ID="pulp-fixture-signing-key"
Copy link
Member

Choose a reason for hiding this comment

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

Are you using any of the pulpcore gpgkey related fixtures? Then both names can happen to appear depending on the installed version of pulpcore.

Copy link
Collaborator

Choose a reason for hiding this comment

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

So, for example, we would need to use one for regular tests and a different one for lowerbounds?

Copy link
Contributor Author

@hstct hstct Nov 21, 2023

Choose a reason for hiding this comment

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

More likely double check onto which branches this got backported to in pulpcore. I will do that once we are ready to merge this.

Copy link
Member

@mdellweg mdellweg Nov 21, 2023

Choose a reason for hiding this comment

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

I would prefer extracting the name from the same fixture providing the key.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think it is worth doing:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mdellweg I updated it so it shouldn't require the actual key name anymore. The keyid should be sufficient and that one I can easily get from the pulpcore fixtures. So hopefully this will work on any version.

@hstct hstct marked this pull request as ready for review November 23, 2023 14:51
It shouldn't require the key name anymore.

[noissue]
@hstct hstct force-pushed the update-signing-key-name branch from d743035 to 79d1b1e Compare November 23, 2023 15:20
@hstct hstct merged commit b639880 into pulp:main Nov 23, 2023
9 checks passed
Copy link

patchback bot commented Nov 23, 2023

Backport to 3.0: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply b639880 on top of patchback/backports/3.0/b63988040b4eac0018cb917368599242507a7612/pr-956

Backporting merged PR #956 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/pulp/pulp_deb.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/3.0/b63988040b4eac0018cb917368599242507a7612/pr-956 upstream/3.0
  4. Now, cherry-pick PR Update signing key name #956 contents into that branch:
    $ git cherry-pick -x b63988040b4eac0018cb917368599242507a7612
    If it'll yell at you with something like fatal: Commit b63988040b4eac0018cb917368599242507a7612 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x b63988040b4eac0018cb917368599242507a7612
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update signing key name #956 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.0/b63988040b4eac0018cb917368599242507a7612/pr-956
  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.

@hstct hstct deleted the update-signing-key-name branch November 23, 2023 20:31
Copy link

patchback bot commented Nov 23, 2023

Backport to 3.1: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.1/b63988040b4eac0018cb917368599242507a7612/pr-956

Backported as #964

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

patchback bot pushed a commit that referenced this pull request Nov 23, 2023
Update signing key name

(cherry picked from commit b639880)
hstct added a commit that referenced this pull request Nov 24, 2023
…eac0018cb917368599242507a7612/pr-956

[PR #956/b6398804 backport][3.1] Update signing key name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[noissue] For PRs with [noissue] in the commit message. (Change won't appear in the changelog).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants