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 migrating Remotes with @ in path #3410

Merged
merged 1 commit into from Nov 17, 2022
Merged

Fix migrating Remotes with @ in path #3410

merged 1 commit into from Nov 17, 2022

Conversation

evgeni
Copy link
Member

@evgeni evgeni commented Nov 17, 2022

fixes #3409

@evgeni
Copy link
Member Author

evgeni commented Nov 17, 2022

I do not understand the s3 and stream failures, but they do not seem related to my change?

@mdellweg
Copy link
Member

I do not understand the s3 and stream failures, but they do not seem related to my change?

The stream scenario is way to flaky to even be required on PR's. The s3 failure is a known timing issue in the test code solved here: https://github.com/pulp/pulpcore/pull/3378/files#diff-6a00adfd5a99b7552f1b1900f49fd6b17bdc306c2fb1bed25cbaff30add4ab63R41
And no, I'm not going to make a separate PR for that. I want that one reviewed and merged.

@patchback
Copy link

patchback bot commented Nov 17, 2022

Backport to 3.18: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.18/a7f138e94203c77ab79a029f6ae9ca5bbe174ccb/pr-3410

Backported as #3411

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

@patchback
Copy link

patchback bot commented Nov 17, 2022

Backport to 3.21: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.21/a7f138e94203c77ab79a029f6ae9ca5bbe174ccb/pr-3410

Backported as #3412

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

@patchback
Copy link

patchback bot commented Nov 17, 2022

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

❌ Failed to cleanly apply a7f138e on top of patchback/backports/3.16/a7f138e94203c77ab79a029f6ae9ca5bbe174ccb/pr-3410

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

0077_move_remote_url_credentials.py fails on Remotes that have @ in path, not netloc
3 participants