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

Fix regression on error-msg matching on functests #3787

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

pedro-psb
Copy link
Member

The error message comes from pulpcore and contained a typo. When it was fixed [0], our test failed to match.

Ideally we would want to have Error Codes, but at this point it would be too costly to implement that.

[0] pulp/pulpcore#5935

The error message comes from pulpcore and contained a typo.
When it was fixed [0], our test failed to match.

Ideally we would want to have Error Codes, but at this point it
would be too costly to implement that.

[0] pulp/pulpcore#5935
Copy link

patchback bot commented Nov 13, 2024

Backport to 3.22: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.22/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

Backported as #3791

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

Copy link

patchback bot commented Nov 13, 2024

Backport to 3.23: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.23/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

Backported as #3790

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

Copy link

patchback bot commented Nov 13, 2024

Backport to 3.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.27/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

Backported as #3792

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

Copy link

patchback bot commented Nov 13, 2024

Backport to 3.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.26/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

Backported as #3789

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

Copy link

patchback bot commented Nov 13, 2024

Backport to 3.25: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.25/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

Backported as #3788

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

Copy link

patchback bot commented Nov 13, 2024

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

❌ Failed to cleanly apply 3aa4310 on top of patchback/backports/3.19/3aa431037ae939c4eb0d6be58911f1101f931144/pr-3787

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants