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

Prevent artifact removal from latest repo version when deleting images #1139

Merged
merged 1 commit into from
Mar 4, 2022

Conversation

bmclaughlin
Copy link
Contributor

Description 🛠

Prevent artifact removal from latest repo version when deleting images
Issue: AAH-1389

Reviewer Checklists 👀

Developer reviewer:

  • Code looks sound, good architectural decisions, no code smells
  • There is a Jira issue associated (note that "No-Issue" should be rarely used)
  • Tests are included in galaxy_ng/tests/integration or galaxy_ng/tests/functional, and they fully cover necessary test scenarios… or tests not needed

QE reviewer (exceptions):

  • Tests are included in galaxy_ng/tests/integration or galaxy_ng/tests/functional, and they fully cover necessary test scenarios… or tests not needed
  • PR meets applicable Acceptance Criteria for associated Jira issue

Note: when merging, include the Jira issue link in the squashed commit

@bmclaughlin
Copy link
Contributor Author

/retest

@newswangerd newswangerd merged commit 947e7d3 into ansible:master Mar 4, 2022
@bmclaughlin bmclaughlin deleted the AAH-1389-reclaim-space branch March 4, 2022 19:15
@bmclaughlin bmclaughlin added the backport-4.4 This PR should be backported to stable-4.4 (2.1) label Mar 4, 2022
@patchback
Copy link

patchback bot commented Mar 4, 2022

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

❌ Failed to cleanly apply 947e7d3 on top of patchback/backports/stable-4.4/947e7d38a429c314da05f675742b5671506515d7/pr-1139

Backporting merged PR #1139 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 remote add 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.4/947e7d38a429c314da05f675742b5671506515d7/pr-1139 upstream/stable-4.4
  4. Now, cherry-pick PR Prevent artifact removal from latest repo version when deleting images #1139 contents into that branch:
    $ git cherry-pick -x 947e7d38a429c314da05f675742b5671506515d7
    If it'll yell at you with something like fatal: Commit 947e7d38a429c314da05f675742b5671506515d7 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 947e7d38a429c314da05f675742b5671506515d7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Prevent artifact removal from latest repo version when deleting images #1139 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.4/947e7d38a429c314da05f675742b5671506515d7/pr-1139
  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.

bmclaughlin added a commit to bmclaughlin/galaxy_ng that referenced this pull request Mar 4, 2022
bmclaughlin added a commit to bmclaughlin/galaxy_ng that referenced this pull request Mar 4, 2022
newswangerd pushed a commit that referenced this pull request Mar 4, 2022
@github-actions github-actions bot added the backported-4.4 This PR has been backported to stable-4.4 (2.1) label Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.4 This PR should be backported to stable-4.4 (2.1) backported-4.4 This PR has been backported to stable-4.4 (2.1)
Projects
None yet
3 participants