Skip to content

Enable system mixing with vendor boot - #3443

Open
bridadan wants to merge 2 commits into
google:mainfrom
bridadan:enable_system_mixing_with_vendor_boot
Open

bridadan wants to merge 2 commits into
google:mainfrom
bridadan:enable_system_mixing_with_vendor_boot

Conversation

@bridadan

Copy link
Copy Markdown
Collaborator

This is a follow up from the discussion in #3430

This lands two changes:

  • Removes the checks that prevent the DiskArtifacts message from being used with the existing artifact fields (in this case, I'm particularly interested in Super.system).
  • Prevents signed builds from being used when the build is being mixed with a different build.

Brian Daniels added 2 commits October 27, 2026 20:22
When the DiskArtifact message was introduced, it was enforced that it
wasn't used in combination with other artifact fields. This removes that
check to allow different combinations of mixing to occur.

Bug: 546186358
Test: bazel test ...
The current behavior will use a signed build for certain builds (e.g.
`-user` builds). However, this prevents mixing with other build
artifacts because the target files are used for these builds, and
target files are unsigned. We detect if this mixing has been
requested, and if so, we stick with unsigned builds.

Bug: 546186358
Test: Confirm the following boots:
      cvd create --config_file config.json

      config.json contents:
      {
            "common": {
                    "host_package": "@ab/git_26Q4-release/cf_x86_64_auto-user"
            },
            "instances": [
                    {
                            "@import": "auto",
                            "disk": {
                                    "default_build": "@ab/git_26Q4-release/cf_x86_64_auto-user",
                                    "super": {
                                            "system": "@ab/git_26Q4-release/gsi_car_x86_64-user"
                                    }
                            }
                    }
            ]
    }
@bridadan
bridadan requested a review from Databean October 27, 2026 20:33
@bridadan bridadan added the kokoro:run Run e2e tests. label Oct 27, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Oct 27, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants