ubuntu: build with snapd from beta

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2026-01-22 10:05:35 +01:00
parent 755f0b0d15
commit 563d142029

View File

@ -155,16 +155,25 @@ else
# We're currently using the dangerous model for the stable image because it # We're currently using the dangerous model for the stable image because it
# allows us to override snaps. But we don't want all snaps from edge like # allows us to override snaps. But we don't want all snaps from edge like
# the dangerous model has, we want most of them from stable excluding: # the dangerous model has, we want most of them from stable excluding:
# * snapd (for TPM/FDE)
# * snapd-desktop-integration (for TPM/FDE) # * snapd-desktop-integration (for TPM/FDE)
# * firmware-updater (for TPM/FDE) # * firmware-updater (for TPM/FDE)
# * desktop-security-center (for TPM/FDE) # * desktop-security-center (for TPM/FDE)
snaps_from_dangerous=(snapd snapd-desktop-integration firmware-updater desktop-security-center) snaps_from_dangerous=(snapd-desktop-integration firmware-updater desktop-security-center)
for snap_arg in $(get_snaps_args_excluding "$stable_model" "${snaps_from_dangerous[@]}"); do
# For these snaps, we ignore the model entirely.
snaps_from_beta=(snapd)
for snap in "${snaps_from_beta[@]}"; do
prepare_args+=("--snap=$snap=beta")
done
# snaps that we are special casing.
_exclude=("${snaps_from_dangerous[@]}" "${snaps_from_beta[@]}")
for snap_arg in $(get_snaps_args_excluding "$stable_model" "${_exclude[@]}"); do
prepare_args+=("$snap_arg") prepare_args+=("$snap_arg")
done done
for comp in $(get_components_excluding "$stable_model" "${snaps_from_dangerous[@]}"); do for comp in $(get_components_excluding "$stable_model" "${_exclude[@]}"); do
components+=("$comp") components+=("$comp")
done done
for comp in $(get_components "$dangerous_model" "${snaps_from_dangerous[@]}"); do for comp in $(get_components "$dangerous_model" "${snaps_from_dangerous[@]}"); do