Skip to content

Support pulpcore 3.107's atomic distribution feature#2301

Merged
dralley merged 1 commit intopulp:mainfrom
dralley:atomic
Apr 1, 2026
Merged

Support pulpcore 3.107's atomic distribution feature#2301
dralley merged 1 commit intopulp:mainfrom
dralley:atomic

Conversation

@dralley
Copy link
Copy Markdown
Contributor

@dralley dralley commented Mar 31, 2026

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

@dralley
Copy link
Copy Markdown
Contributor Author

dralley commented Mar 31, 2026

I think 2.15 can be dropped from the supported_release_branches now that AAP has moved on

@dralley
Copy link
Copy Markdown
Contributor Author

dralley commented Mar 31, 2026

Hmm, this one actually does require a pulpcore bump since it defers to pulpcore itself for some of the logic

I could either:

  • just copy the logic into the container plugin entirely as the previous implementation did

or

  • keep this implementation, bump the pulpcore requirement, and backport using a separate patch that takes the former approach

Copy link
Copy Markdown
Contributor

@gerrod3 gerrod3 left a comment

Choose a reason for hiding this comment

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

We should backport this.

Copy link
Copy Markdown
Contributor

@gerrod3 gerrod3 left a comment

Choose a reason for hiding this comment

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

I had this on the review tab and didn't see the failing tests. Can you try this. I think that will simplify the backports and allow us to not have to bump pulpcore.

Comment on lines +44 to +47
fields = super().distribution_extra_fields(repository, upstream_distribution)
fields["private"] = upstream_distribution["private"]
fields["description"] = upstream_distribution["description"]
return fields
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you try just popping the publication field? I think that would make the tests pass.

@dralley
Copy link
Copy Markdown
Contributor Author

dralley commented Apr 1, 2026

Let me know which approach you want to take & I'll squash.

@dralley dralley enabled auto-merge (rebase) April 1, 2026 19:43
@dralley dralley merged commit de8e655 into pulp:main Apr 1, 2026
14 checks passed
@patchback
Copy link
Copy Markdown

patchback bot commented Apr 1, 2026

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

❌ Failed to cleanly apply de8e655 on top of patchback/backports/2.20/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backporting merged PR #2301 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_container.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/2.20/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301 upstream/2.20
  4. Now, cherry-pick PR Support pulpcore 3.107's atomic distribution feature #2301 contents into that branch:
    $ git cherry-pick -x de8e65549b81d79e6884b1b28df11eb70c31467d
    If it'll yell at you with something like fatal: Commit de8e65549b81d79e6884b1b28df11eb70c31467d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x de8e65549b81d79e6884b1b28df11eb70c31467d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Support pulpcore 3.107's atomic distribution feature #2301 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.20/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301
  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
Copy Markdown

patchback bot commented Apr 1, 2026

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

❌ Failed to cleanly apply de8e655 on top of patchback/backports/2.19/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backporting merged PR #2301 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_container.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/2.19/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301 upstream/2.19
  4. Now, cherry-pick PR Support pulpcore 3.107's atomic distribution feature #2301 contents into that branch:
    $ git cherry-pick -x de8e65549b81d79e6884b1b28df11eb70c31467d
    If it'll yell at you with something like fatal: Commit de8e65549b81d79e6884b1b28df11eb70c31467d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x de8e65549b81d79e6884b1b28df11eb70c31467d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Support pulpcore 3.107's atomic distribution feature #2301 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.19/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301
  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
Copy Markdown

patchback bot commented Apr 1, 2026

Backport to 2.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.26/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backported as #2302

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

@patchback
Copy link
Copy Markdown

patchback bot commented Apr 1, 2026

Backport to 2.22: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.22/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backported as #2303

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

@patchback
Copy link
Copy Markdown

patchback bot commented Apr 1, 2026

Backport to 2.24: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.24/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backported as #2304

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

@patchback
Copy link
Copy Markdown

patchback bot commented Apr 1, 2026

Backport to 2.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.27/de8e65549b81d79e6884b1b28df11eb70c31467d/pr-2301

Backported as #2305

🤖 @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.

2 participants