Skip to content

Conversation

@dralley
Copy link
Contributor

@dralley dralley commented Dec 1, 2025

closes #2122

Copy link
Member

@mdellweg mdellweg left a comment

Choose a reason for hiding this comment

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

none of these fields are required [from the comment]

This sounds about right then.

@dralley dralley merged commit 0057a97 into pulp:main Dec 2, 2025
12 of 13 checks passed
@dralley dralley deleted the fix-config-blob branch December 2, 2025 14:00
@patchback
Copy link

patchback bot commented Dec 13, 2025

Backport to 2.24: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2128

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

@patchback
Copy link

patchback bot commented Dec 13, 2025

Backport to 2.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2127

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

@patchback
Copy link

patchback bot commented Dec 13, 2025

Backport to 2.22: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.22/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2129

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

@patchback
Copy link

patchback bot commented Dec 15, 2025

Backport to 2.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2133

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

@patchback
Copy link

patchback bot commented Dec 15, 2025

Backport to 2.24: 💔 creation of the backport PR failed

❌ Backport PR branch: patchback/backports/2.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Validation Failed: 'A pull request already exists for pulp:patchback/backports/2.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123.'

Backporting merged PR #2123 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.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123 upstream/2.24
  4. Now, cherry-pick PR Account for self.config_blob potentially being Null #2123 contents into that branch:
    $ git cherry-pick -x 0057a979082df3ea61ef394524576c46dc244259
    If it'll yell at you with something like fatal: Commit 0057a979082df3ea61ef394524576c46dc244259 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0057a979082df3ea61ef394524576c46dc244259
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Account for self.config_blob potentially being Null #2123 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123
  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 Dec 15, 2025

Backport to 2.26: 💔 creation of the backport PR failed

❌ Backport PR branch: patchback/backports/2.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Validation Failed: 'A pull request already exists for pulp:patchback/backports/2.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123.'

Backporting merged PR #2123 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.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123 upstream/2.26
  4. Now, cherry-pick PR Account for self.config_blob potentially being Null #2123 contents into that branch:
    $ git cherry-pick -x 0057a979082df3ea61ef394524576c46dc244259
    If it'll yell at you with something like fatal: Commit 0057a979082df3ea61ef394524576c46dc244259 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0057a979082df3ea61ef394524576c46dc244259
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Account for self.config_blob potentially being Null #2123 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.26/0057a979082df3ea61ef394524576c46dc244259/pr-2123
  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 Dec 15, 2025

Backport to 2.24: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.24/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2134

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

@patchback
Copy link

patchback bot commented Dec 15, 2025

Backport to 2.22: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.22/0057a979082df3ea61ef394524576c46dc244259/pr-2123

Backported as #2135

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

[PULP-1006] Manifest.init_architecture_and_os() doesn't account for self.config_blob being Null

2 participants