Backport #26037 ([orchestrator] fix confirmation requirement bug and enable classifying blind assembly parts ) #28853
Conversation
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
pamaury
requested review from
eshapira and
timothytrippel
and removed request for
a team
pamaury
force-pushed
the
backport_26037
branch
from
04ad5f4 to
c1462ba
Compare
Previously the package ID was defined in the HJSON SKU configuration file. This updates the orchestrator.py script to enable overriding this field via a command line arg. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit c564ac4)
The "enable-alerts" and "use-ext-clk" flags of the orchestrator.py script are already tested in a separate test. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit eaf6c7e)
This test was temporarily disabled to deal with CI issues that have now been resolved. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 922fc1b)
Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit ae75936)
This updates the SKU specific portion of the device ID to add the following subfields: 1. AST config version - 1 byte 2. OTP ID - 2 byte ASCII string 3. OTP version - 1 byte hex number 4. SKU specific version - 1 byte hex number Signed-off-by: Tim Trippel <[email protected]> [manuf] align format of OTP image names This aligns all OTP image names to a four character format: <alpha><alpha><uint in range [0,256)> This allows easily converting the OTP image name string into a two character OTP ID code and 2 hex digit OTP version number to be embedded in the SKU specific portion of the device ID. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit ba4b885)
Blind assembly parts should have a DIN set to all Fs. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 845ae36)
Confirmation requirement should only be required when the `--non-interactive` mode CLI arg is NOT passed. This updates the script behavior to disble the confirmation requirement when said flag is passed and a host/device device ID mismatch occurs, which typically happens on parts that have had CP run, and later FT run, as opposed to running both stages back to back. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 1a9b069)
pamaury
force-pushed
the
backport_26037
branch
from
c1462ba to
dd04d05
Compare
jwnrt
approved these changes
Dec 2, 2025
Contributor
jwnrt
left a comment
jwnrt
left a comment
There was a problem hiding this comment.
Last two commits look okay (N.B. I'm inexperienced with provisioning)
This was causing Python lint errors in CI. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit e11d41f)
timothytrippel
approved these changes
Dec 3, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport #26037 and one commit of #26648 to fix a python linting issue. Depends on #28799. Review last three commits