130 Commits

Author SHA1 Message Date
Olivier Gayot
2f918331fb ubuntu: use the same for in construct when getting snap args
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 16:14:53 +01:00
Olivier Gayot
e6558e2541 ubuntu: add a filter for snaps too
We now filter snaps using jq rather than grep. The change has a slight impact
because snapd-desktop-integration was filtered out by "grep snapd" but isn't
filtered out anymore with jq.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 16:14:53 +01:00
Olivier Gayot
01c80d8d0a ubuntu: fix snap components pulled from the wrong model
We have a mechanism in place to override a snap when building an image.
Unfortunately, we didn't factor this in when forcing optional components to be
included in the image.

This was okay before because the stable model and the dangerous model had the
same components declared.

But now that pc-kernel has different components in the stable and the dangerous
model, things are broken.

Indeed, when building the stable image, we tried to include the pc-kernel from
the stable model with the pc-kernel components from the dangerous model. But
they are not compatible.

Fixed by including components from the right model. If we're overriding a snap
with a definition from a different model, then pull the components from that
same model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 16:14:53 +01:00
Olivier Gayot
72511a0381 ubuntu: declare variables from stable & dangerous models
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 14:56:13 +01:00
Olivier Gayot
caf4f1030a ubuntu: when building stable image, don't take pc-kernel from beta
The pc-kernel version in 26.04/beta is kernel 6.17, which uses different
components from what is currently declared in the model.

This used to be necessary when there was no kernel in 26.04/stable, but now
there is a 6.8 version in 26.04/stable. The available components match what's
in the model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 17:24:40 -07:00
Olivier Gayot
49e1ab15cd ubuntu: use a local variable where possible
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 16:52:22 +01:00
Olivier Gayot
5cbea9f677 ubuntu: add --comp for each optional component from the model
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 16:52:22 +01:00
Olivier Gayot
e5ef47f7dd ubuntu: fix typo in comment
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-01 12:51:10 -07:00
Didier Roche
e78505a5f3
Refresh new signed models with mesa
This mesa snap is needed starting with core24 apps.
2025-11-26 08:52:16 +01:00
Didier Roche
98c75ef41b
Switch to new GNOME platform snap 2025-11-25 11:38:49 +01:00
Olivier Gayot
b3ddf6a78a ubuntu: use snapd, desktop-security-center and firmware-updater from edge for TPM/FDE
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-19 10:32:21 +01:00
Olivier Gayot
21372df0f9 ubuntu: update the models for 26.04
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:24:10 +01:00
Olivier Gayot
001aed3b3b ubuntu: use an array for prepare_args
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:24:09 +01:00
Olivier Gayot
9164e58d83 ubuntu: build with grade: dangerous but keep most snaps from stable
Because some snaps are not yet in their respective stable channel in 26.04, the
build fails. When preparing the image we can add --snap options to override the
channel of the different snaps. But we can only do that if we're building with
grade: dangerous. As a workaround this issue, we build with the non-dangerous
ISO with the dangerous model, but keep the snaps on their original channel
defined in the non dangerous model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:23:27 +01:00
Dan Bungert
ec74e75597 desktop: handle unset SUBPROJECT 2025-11-14 08:19:17 -07:00
Dan Bungert
596d6d8464 desktop: update dangerous model for 26.04 2025-10-31 11:14:42 +01:00
Dan Bungert
918bc13a3a desktop: use dangerous model until stable channel snaps are available 2025-10-29 13:09:11 +01:00
Michael Hudson-Doyle
8de7b2eb10 Disable apparmor_restrict_unprivileged_userns in the live layers. (LP: #2122675) 2025-09-15 12:28:30 +12:00
Michael Hudson-Doyle
785c4c53d3 Fix daily-dangerous builds:
* Fix daily-dangerous builds:
  - Copy hooks.
  - Mangle the channel of seeded snaps to use the edge risk of whichever
    track they are taken from.
  - Update the dangerous model to reference tracks that actually exist.
  - Include providers of content plugs when seeding snaps and creating
    TPMFDE system.
  - Do not attempt to build an UEFI boot image or hyperv desktop image for
    this project/subproject combination.
2025-09-15 09:09:02 +12:00
Tim Andersson
2ae311a772
030-ubuntu-enhanced-sb.binary: remove snap overrides
This is follow up work to LP: #2120473 being resolved.
2025-08-18 10:12:07 +01:00
Tim Andersson
e654618ec5
update classic model for 25.10 2025-08-18 10:12:07 +01:00
Tim Andersson
80aa8b71d6
new: changes to enable daily-dangerous image builds
daily-dangerous image builds are standard desktop images for the devel
series, except all of the snaps are set to their respective edge
channels, and the dangerous model is used, hence its inclusion in this
commit.

Goes hand in hand with this MP:
https://code.launchpad.net/~andersson123/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/490708
2025-08-18 10:11:58 +01:00
Michael Hudson-Doyle
af76e8089d do not completely delete the seed from the live layer 2025-08-13 10:32:03 +12:00
Michael Hudson-Doyle
5494522a14 Put the uc20-style system seed for TPM backed FDE in the live layer. 2025-08-13 10:32:03 +12:00
Dan Bungert
6c2b20e070 desktop TPMFDE: move most snaps to stable channels 2025-08-07 16:18:04 -06:00
Dan Bungert
e46416e873 Revert "Move back ubuntu classic to a standard model"
This reverts commit 1c631c99dc2a8fd5759e9c8f872610b1f2238ddf.

We're unfortunately not ready for the standard model yet.
2025-08-07 16:17:20 -06:00
Didier Roche
1c631c99dc
Move back ubuntu classic to a standard model
We don’t use edge anymore. The model still needs to be signed though.
2025-08-06 07:36:59 +02:00
Tim Andersson
3dd6f72a21
switch snaps back to stable now that the TPM FDE spike is over.
This was enabled for more rapid development on the snaps that go into
the live desktop image. Revert now that the spike is over.
2025-07-30 16:49:10 +01:00
Didier Roche
59e55cb364
Merge branch 'polkit-allow-snap-seeding' into ubuntu/master 2025-07-15 16:30:33 +02:00
Didier Roche
69f6b3795b
Allow the ubuntu-desktop-installer to request snap seeding state
This is used to only start the installer after all snaps have been
seeded.

Co-Authored-By: Dennis Loose <dennis.loose@canonical.com>
2025-07-15 16:24:10 +02:00
Zygmunt Krynicki
c4fbaf5d3b Use snap wait system seed.loaded to wait for snapd
We cannot use After=snapd.service as user services cannot synchronize
with system services. Using `snap system wait seed.loaded` should work,
except for the fact that it requires polkit authentication to perform
this operation.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
2025-07-14 11:15:50 +02:00
Didier Roche
8a70acb1ec
Make sure the system was seeded before starting the installer
The installer is a snap, and as such, the system needs to be seeded
first to avoid a race during live boot.
Fixes https://bugs.launchpad.net/ubuntu-desktop-provision/+bug/2114923
2025-07-11 13:05:08 +02:00
Didier Roche
231ee26831 Switch some TPM FDE components to edge channels
We want the firmware updater and security center pointing to edge too.
The model only allow to select it, but we need to invoke them by
default in snap prepare-image
2025-06-13 10:54:19 -06:00
Dan Bungert
a0d948f17b desktop: TPMFDE snapd from latest/edge 2025-05-28 10:03:56 -06:00
Dan Bungert
37dd412bfa desktop: TPMFDE kernel from 25.10/candidate 2025-05-23 19:50:34 -06:00
Dan Bungert
dde90dfb79 desktop: cherry-pick pc-kernel from different channel
To get 25.10 Desktop ISOs with TPMFDE bits, we need matching pc-kernel
and snapd otherwise we get errors like so when running
`snap prepare-image`:

WARNING: the kernel for the specified UC20+ model does not carry
assertion max formats information, assuming possibly incorrectly the
kernel revision can use the same formats as snapd
error: snapd 2.68+ is not compatible with a kernel containing snapd
prior to 2.68

Use the "dangerous" model, which allows overriding the channel, and pick
up the matching pc-kernel which is not yet on 25.10/stable, where the
non-dangerous model would expect to find it.
2025-05-23 09:53:18 -06:00
Dan Bungert
83022a6ebe desktop: add notes about generation of a signed model 2025-05-22 10:29:05 -06:00
Dan Bungert
237595f90a desktop: no long skip 020-ubuntu-enhanced-sb.binary 2025-05-14 16:14:28 +02:00
Dan Bungert
f472f1e437 desktop: update TPMFDE model for questing 2025-05-14 16:14:28 +02:00
Dan Bungert
5dc5cd082a desktop: skip 020-ubuntu-enhanced-sb.binary 2025-05-05 15:06:53 +02:00
Dan Bungert
5f5a686760 desktop: no longer involve cloud-init in early networking
LP: #2107225
2025-04-23 16:23:19 -06:00
Dan Bungert
c1d898ed2c desktop: update tpmfde model for pc-kernel channel
* Updated model to move pc-kernel to channel 25.04/stable
* Move model from heredoc to a file
2025-03-13 11:03:10 -06:00
Dan Bungert
20590f0dbf ubuntu-desktop: update model for 25.04 and components
This model intentionally uses pc-kernel from a branch, for components
testing purposes.  We'll have to update this again before release when
the desired pc-kernel is on a stable channel.
2025-03-11 09:14:18 -06:00
Simon Quigley
784c7d3060 Make the package completely Lintian-clean except for no-dep5-copyright. 2025-02-18 22:53:52 -06:00
Michael Hudson-Doyle
c17a99bc1f Allow snapd to re-exec in installer environment (the issues between snapd, overlayfs and apparmer that meant re-execing caused problems were fixed in snapd a long time ago). 2025-01-29 06:39:25 +13:00
Łukasz 'sil2100' Zemczak
9b1ea66dc8 Add comment re: the cohort key in prepare-image 2024-10-08 13:30:36 +01:00
Łukasz 'sil2100' Zemczak
293ec25aba Use cohort key for prepare-image. 2024-10-08 13:08:14 +01:00
Michael Hudson-Doyle
3f44a55392 Update the model used for TPM FDE installs, yet again. 2024-10-04 11:53:16 +13:00
Dan Bungert
5e990020e5 desktop: remove references to subiquity snap
No subiquity snap is present on Desktop isos, these are cruft.
2024-10-02 08:20:34 -06:00
Michael Hudson-Doyle
e5ef431598 Update the model used for TPM FDE installs, again, hopefully working this time. 2024-10-02 19:05:26 +13:00