many: allow systems installed via installer API to pick optional snaps and components #14426
Conversation
github-actions
bot
added
Needs Documentation -auto-
andrewphelpsj
force-pushed
the
optional-install-api-impl
branch
2 times, most recently
from
3870e0b to
5eba35a
Compare
andrewphelpsj
force-pushed
the
optional-install-api-impl
branch
from
5eba35a to
6762c7a
Compare
tests/lib/muinstaller/main.go
Outdated
| @@ -295,6 +297,21 @@ func postSystemsInstallFinish(cli *client.Client, | |||
| return waitChange(chgId) | |||
| } | |||
|
|
|||
| func maybeGetOptionalInstall() *client.OptionalInstallRequest { | |||
| f, err := os.Open("./optional-install.json") | |||
There was a problem hiding this comment.
I think it would be better to pass the json file as a program argument to make it more explicit.
There was a problem hiding this comment.
Added flags to muinstaller in c853aa3.
| # default (unencrypted) case | ||
| NESTED_ENABLE_TPM: false | ||
| NESTED_ENABLE_SECURE_BOOT: false | ||
|
|
There was a problem hiding this comment.
You could remove the "plain" ones I think.
There was a problem hiding this comment.
I think it probably would be better to run the various test cases with encryption on, right? And then leave this plain case to cover the unencrypted case.
There was a problem hiding this comment.
Agreed, then these two should be set to true and maybe remove the "encrypted" case as it will be covered by the "install*" cases.
| # default (unencrypted) case | ||
| NESTED_ENABLE_TPM: false | ||
| NESTED_ENABLE_SECURE_BOOT: false | ||
|
|
There was a problem hiding this comment.
Agreed, then these two should be set to true and maybe remove the "encrypted" case as it will be covered by the "install*" cases.
andrewphelpsj
force-pushed
the
optional-install-api-impl
branch
from
0b9ce2a to
a881fd2
Compare
andrewphelpsj
force-pushed
the
optional-install-api-impl
branch
2 times, most recently
from
5afd742 to
3a019e8
Compare
…epresent uses devicestate.OptionalContainers
andrewphelpsj
force-pushed
the
optional-install-api-impl
branch
from
3a019e8 to
437f018
Compare
|
The tests failing here are known and unrelated to the changes in this PR, and I've verified that they're also present on master. |
…s and components (canonical#14426) * daemon, o/devicestate: rename devicestate.OptionalInstall to better represent uses devicestate.OptionalContainers * o/devicestate: add available optional snap and components to the System struct * daemon: report available optional containers for a system available for install * o/devicestate, s/seedtest: handle optional-install field on install-finish task * tests: test seeding optional snaps and components from snapd installer api * tests: use flags for arguments passed to the muinstaller * tests: use encrypted installation for cases with optional snaps and components * tests: make test work for core24 too
This PR ties together work that enables users to pick which snaps and components to install from a set of available containers.