StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

snapcraft: use snapcraft pack instead of snapcraft snap 

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2023-10-20 15:41:24 +02:00
parent 599aefdd73
commit b0e1c57145
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DESIGN.md
View File

@ -521,7 +521,7 @@ Tests (and lint checks) are run by github actions using lxd. See
`.github/workflows/build.yaml` and `./scripts/test-in-lxd.sh` and so `.github/workflows/build.yaml` and `./scripts/test-in-lxd.sh` and so
on. on.
For "real" testing, you need to make a snap (`snapcraft snap`), mash For "real" testing, you need to make a snap (`snapcraft pack`), mash
it into an existing ISO using `./scripts/inject-subiquity-snap.sh`, it into an existing ISO using `./scripts/inject-subiquity-snap.sh`,
and boot the result in a VM. There is an even hackier pair of scripts and boot the result in a VM. There is an even hackier pair of scripts
(`./scripts/slimy-update-snap.sh` and (`./scripts/slimy-update-snap.sh` and

2
README.md
View File

@ -62,7 +62,7 @@ do this:
1. Build your change into a snap: 1. Build your change into a snap:
``` ```
$ snapcraft snap --output subiquity_test.snap $ snapcraft pack --output subiquity_test.snap
``` ```
2. Grab the current version of the installer: 2. Grab the current version of the installer:

4
scripts/kvm-test.py
View File

@ -306,14 +306,14 @@ def build(ctx):
with snap_manager('subiquity_test.snap') as snap: with snap_manager('subiquity_test.snap') as snap:
if not ctx.args.reuse: if not ctx.args.reuse:
run('snapcraft clean --use-lxd') run('snapcraft clean --use-lxd')
run(f'snapcraft snap --use-lxd --output {snap} {snapargs}') run(f'snapcraft pack --use-lxd --output {snap} {snapargs}')
assert_exists(snap) assert_exists(snap)
livefs_edit(ctx, '--add-snap-from-store', 'core20', 'stable', livefs_edit(ctx, '--add-snap-from-store', 'core20', 'stable',
'--inject-snap', snap) '--inject-snap', snap)
elif project == 'ubuntu-desktop-installer': elif project == 'ubuntu-desktop-installer':
with snap_manager('udi_test.snap') as snap: with snap_manager('udi_test.snap') as snap:
run('snapcraft clean --use-lxd') run('snapcraft clean --use-lxd')
run(f'snapcraft snap --use-lxd --output {snap} {snapargs}') run(f'snapcraft pack --use-lxd --output {snap} {snapargs}')
assert_exists(snap) assert_exists(snap)
run(f'sudo ./scripts/inject-snap {ctx.baseiso} {ctx.iso} {snap}') run(f'sudo ./scripts/inject-snap {ctx.baseiso} {ctx.iso} {snap}')
else: else:

2
scripts/test-this-branch.sh
View File

@ -6,7 +6,7 @@ cd $(dirname $(dirname $(readlink -f $0)))
sudo apt install -y zsync xorriso isolinux sudo apt install -y zsync xorriso isolinux
snapcraft snap --output subiquity_test.snap snapcraft pack --output subiquity_test.snap
urlbase=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current urlbase=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current
distroname=$(distro-info -d) distroname=$(distro-info -d)
isoname="${distroname}"-live-server-$(dpkg --print-architecture).iso isoname="${distroname}"-live-server-$(dpkg --print-architecture).iso