[ci] Relock staged sources without advancing pins - #153
Open
rebtoor wants to merge 1 commit into
Open
Conversation
Speculative builds stage Zuul-patched src/ then still compile against committed requirements.lock.<stream>. Reusing update-sources would refresh constraints but also clone unstaged siblings at branch tip and rewrite sources.txt. Add sync-locks to refresh upper-constraints, clone missing sources at the committed pin, and regenerate lockfiles from the current src trees. Assisted-By: Cursor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
rebtoor
requested review from
amoralej,
elfiesmelfie and
fmount
and removed request for
amoralej
August 31, 2026 09:39
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.
Summary
Speculative content-provider builds stage Zuul-patched
src/trees, then still compile against the committedrequirements.lock.<stream>. That mismatch is what fails jobs like heatopenstack-checkwhen a staged change raises a lower bound past the lock (for exampleoslo.versionedobjects>=3.12.0vs lock3.11.0).Reusing
update-sourceswould refresh constraints, but it also clones unstaged sibling repos at branch tip and rewritessources.txt. This change addsbuild.sh sync-locks:upper-constraints.txt.<stream>from the stream branch tip, or from a Zuulopenstack/requirementscheckout (REQUIREMENTS_SRC) when one is in the buildset.src/in place; clone missing siblings at the committed pin.requirements.lock.<stream>andbuildrequirements.lock.<stream>from currentsrc/*/requirements.txt.sources.txtorrpms.in.yaml.The content provider runs
tox -e sync-locksonly when sources were actually staged, usingensure-toxfrom zuul-jobs.Test plan
tests/test_update_sources.shsync-locks cases (pins preserved, UC from tip /REQUIREMENTS_SRC, clone-at-pin, staged tree kept, norpms.in.yaml, default-stream symlinks)sync-locks