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

Re-Enable /collections/all/ endpoints (now streamed) #806

Merged
merged 2 commits into from
Jun 24, 2021

Conversation

rochacbruno
Copy link
Member

Streamed andpoints enabled on pulp/pulp_ansible#586

Requires PR: pulp/pulp_ansible#586
Issue: AAH-224

@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@rochacbruno rochacbruno added the backport-4.3 This PR should be backported to stable-4.3 (2.0) label Jun 23, 2021
Copy link
Contributor

@alikins alikins left a comment

Choose a reason for hiding this comment

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

LGTM. May need a rebase depending on if #807 gets merged first.

@rochacbruno rochacbruno merged commit fb7d9b3 into ansible:master Jun 24, 2021
@rochacbruno rochacbruno deleted the AAH-224.c branch June 24, 2021 17:19
@patchback
Copy link

patchback bot commented Jun 24, 2021

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

❌ Failed to cleanly apply fb7d9b3 on top of patchback/backports/stable-4.3/fb7d9b30877fef084a6c357830015321e7920e12/pr-806

Backporting merged PR #806 into master

  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 add remote upstream https://github.com/ansible/galaxy_ng.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-4.3/fb7d9b30877fef084a6c357830015321e7920e12/pr-806 upstream/stable-4.3
  4. Now, cherry-pick PR Re-Enable /collections/all/ endpoints (now streamed) #806 contents into that branch:
    $ git cherry-pick -x fb7d9b30877fef084a6c357830015321e7920e12
    If it'll yell at you with something like fatal: Commit fb7d9b30877fef084a6c357830015321e7920e12 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x fb7d9b30877fef084a6c357830015321e7920e12
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Re-Enable /collections/all/ endpoints (now streamed) #806 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.3/fb7d9b30877fef084a6c357830015321e7920e12/pr-806
  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.

@rochacbruno
Copy link
Member Author

@newswangerd do we need it backported to stable-4.3? or it can be here only for 4.4?

@newswangerd
Copy link
Member

@newswangerd do we need it backported to stable-4.3? or it can be here only for 4.4?

Nope. This endpoint should only be needed for cloud.redhat.com.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.3 This PR should be backported to stable-4.3 (2.0)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants