auto/config: alter check for unexpectedly seeded snaps in ubuntu-cpc:minimized build. As the build no longer implicitly seeds the snaps from the server seed, we can just assert no snaps are seeded. This fixes an autopkgtest regression but also cleaner.

add-new-budgie
Michael Hudson-Doyle 2 years ago
parent 35a56a5e03
commit 628134dfe7

4
debian/changelog vendored

@ -4,6 +4,10 @@ livecd-rootfs (2.840) UNRELEASED; urgency=medium
to get their desktop packages. Previously most (all?) flavour builds got
the snaps from that flavour's "desktop" seed implicitly added, but now an
explicit add_task is needed.
* auto/config: alter check for unexpectedly seeded snaps in
ubuntu-cpc:minimized build. As the build no longer implicitly seeds the
snaps from the server seed, we can just assert no snaps are seeded. This
fixes an autopkgtest regression but also cleaner.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 18 May 2023 09:25:38 +1200

@ -1170,22 +1170,15 @@ case $PROJECT:${SUBPROJECT:-} in
esac
if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-cpc:minimized ]; then
# We install a lxc script that installs the snap when invoked. We don't
# want any other snaps to come in without due consideration, so fail the
# build if we see such a snap.
for snap in `cat config/seeded-snaps`; do
case $snap in
lxd | lxd=*)
;;
*)
echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap"
# We install a lxc script that installs the snap when invoked and
# don't want any other snaps.
if [ -s config/seeded-snaps ]; then
echo "Unexpected seeded snaps for ubuntu-cpc:minimized build:"
cat config/seeded-snaps
exit 1
;;
esac
done
fi
# Truncate but don't delete to a) prevent any snaps from being seeded,
# while at the same time b) triggering initialization of assertions.
# Create an empty file to trigger initialization of assertions.
truncate --size 0 config/seeded-snaps
fi

Loading…
Cancel
Save