Backport 26017 ([orchestrator] refactor SKU specific portion of device ID) #28799
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
This runs the E2E orchestrator provisioning test on all SKUs. Currently, E2E provisioning flows are also runnable via an `opentitan_test` rule. These will be removed in a future commit to simplify SKU management. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 5e0c795)
All provisioning flows are now tested E2E with the orchestrator script. This makes the `opentitan_test` targets that also ran said flows redundant and unneeded, thus we remove them. Additionally, we no longer need duplicate CA configuration files as these are generated on the fly by the orchestrator script from the same information that was duplicated in the orchestrator SKU configuration files. This simplifies our test infrastructure and provisioning flow configurations. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 6a5747a)
If CP flow is skipped because a device is already in TEST_LOCKED* state, then the device ID constructed during FT will be the final device ID. This is what should be used to update the database with. Signed-off-by: Tim Trippel <[email protected]> (cherry picked from commit 76d0596)
pamaury
requested review from
jwnrt,
moidx and
timothytrippel
and removed request for
a team,
cfrantz,
moidx and
timothytrippel
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)
pamaury
force-pushed
the
backport_26017
branch
from
2504eb5 to
f7e3011
Compare
jwnrt
approved these changes
Nov 25, 2025
Contributor
jwnrt
left a comment
jwnrt
left a comment
There was a problem hiding this comment.
As before I don't know provisioning well but the backport of the last commit looks fine and I didn't see any obvious problems.
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 #26017. Depends on #28796, only review the last commit.