TOOL-30781 point linux-pkg's os-upgrade branch at the resolute suite - #411
Merged
prakashsurya merged 1 commit intoAug 8, 2026
Merged
Conversation
…solute
The os-upgrade mirror published its first resolute snapshot on 2026-08-08, and
it carries resolute only: resolute{,-updates,-security,-backports} under
ubuntu/, and resolute, resolute-pgdg and stable under ppas/. The branch's
UBUNTU_DISTRIBUTION default still said noble, so configure_apt_sources() wrote
source lines for suites that mirror does not have, and every linux-pkg
os-upgrade job died at apt-get update before it got as far as git:
E: The repository '.../os-upgrade/latest/ubuntu noble-backports Release'
does not have a Release file.
The default stays environment-overridable, so a build can still be aimed at
another suite without editing the branch.
get_kernel_version_for_platform_from_apt() pins the generic platform to
linux-image-generic-hwe-24.04. That one would not have failed: resolute still
publishes an hwe-24.04 metapackage, and it depends on the same 7.0.0-14.14
kernel as hwe-26.04, so the stale pin resolves to the right kernel by accident
and would not have announced itself for the rest of the cycle. Point it at
hwe-26.04.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
linux-pkg'sos-upgradebranch still defaultsUBUNTU_DISTRIBUTIONtonoble, so everylinux-pkg/os-upgradejob points apt at a suite the branch's mirror does not carry.The mirror is no longer what's blocking.
os-upgrade/latest/promoted on 2026-08-08 05:09 UTC (snapshot8411ab44) and publishes resolute, and only resolute:with
ubuntu/dists/resolute/ReleasereportingCodename: resolute/Version: 26.04. Since there are nonoblesuites under this branch,configure_apt_sources()writesdeb <mirror> noble ...lines that resolve to nothing and the jobs die before they get as far as git:The
generickernel lookup is pinned the same way;get_kernel_version_for_platform_from_apt()asks forlinux-image-generic-hwe-24.04. That one does not hard-fail, which is what makes it worth catching now: resolute still publishes anhwe-24.04metapackage, and it depends on the same7.0.0-14.14kernel ashwe-26.04, so the stale pin resolves to the right kernel by accident and would not have announced itself for the rest of the cycle.Solution
The solution taken in this PR is to bump both pointers:
UBUNTU_DISTRIBUTIONdefaultnoble->resoluteinlib/common.sh. It stays environment-overridable (${UBUNTU_DISTRIBUTION:-resolute}, from TOOL-30719), so a build can still be aimed at another suite without editing the branch.genericHWE metapackagelinux-image-generic-hwe-24.04->-hwe-26.04.This targets
os-upgraderather thandevelop, since it cannot land on develop until the Phase 4 cutover. 24.04 analog: DLPX-91976 / #322.The branch was re-reset to
develop(01b2d791e->fef16a859) before this change, since it had drifted behind again and was missing #408, #410, TOOL-30738 and #405. That reset is also what drops the9999.0.0.0mirror-host sentinel, so there is nothing separate to do for it here.Testing Done
make check(shellcheck + shfmt) passes.resolute{,-updates,-security,-backports}underubuntu/, andresolute+resolute-pgdg+stableunderppas/.linux-image-generic-hwe-26.04exists in resolute (7.0.0-14.14inresolute,7.0.0-29.29inresolute-updates), so the new pin resolves.No package build has been run against this yet.
build-packagesonos-upgradeis the next step and is where the real fallout is expected to show up; the intent is to fix-forward on the branch from there.