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

Artifacts cleanup on deleting collection #1336

Merged
merged 2 commits into from
Jul 6, 2022

Conversation

jerabekjiri
Copy link
Contributor

Issue: AAH-1749

What is this PR doing:

Removing artifacts on deleting collection. Solution taken from pulp_ansible/tasks/deletion.py

Issue: AAH-1749

Reviewers must know:

Reuploading collection fails with duplicate key: duplicate key value violates unique constraint "core_artifact_sha256_key"

PR Author: Add a QE reviewer (exceptions);
Reviewers: look for sound code, no code smells, docs & test coverage
Merger: When merging, include the Jira issue link in the squashed commit

@jerabekjiri jerabekjiri requested a review from newswangerd July 1, 2022 11:15
@newswangerd newswangerd added backport-4.4 This PR should be backported to stable-4.4 (2.1) backport-4.5 This PR should be backported to stable-4.5 (2.2) labels Jul 6, 2022
@newswangerd newswangerd merged commit 8b9432f into ansible:stable-4.4 Jul 6, 2022
@patchback
Copy link

patchback bot commented Jul 6, 2022

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

❌ Failed to cleanly apply 8b9432f on top of patchback/backports/stable-4.4/8b9432fe30f1f8231e2783d890c261d6ce63b888/pr-1336

Backporting merged PR #1336 into stable-4.4

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

@patchback
Copy link

patchback bot commented Jul 6, 2022

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

❌ Failed to cleanly apply 8b9432f on top of patchback/backports/stable-4.5/8b9432fe30f1f8231e2783d890c261d6ce63b888/pr-1336

Backporting merged PR #1336 into stable-4.4

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

@newswangerd newswangerd removed backport-4.4 This PR should be backported to stable-4.4 (2.1) backport-4.5 This PR should be backported to stable-4.5 (2.2) labels Jul 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants