Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions spread.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,9 @@ backends:
- ubuntu-core-22-arm-32:
username: external
password: ubuntu
- ubuntu-core-24-64:
username: external
password: ubuntu

path: /home/gopath/src/github.com/snapcore/snapd

Expand Down
9 changes: 8 additions & 1 deletion tests/lib/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ ensure_jq() {
elif os.query is-core22; then
snap install --devmode --edge jq-core22
snap alias jq-core22.jq jq
elif os.query is-core24; then
# TODO: publish jq-core24
snap install --devmode --edge jq-core22
Comment thread
mvo5 marked this conversation as resolved.
Outdated
snap alias jq-core22.jq jq
else
snap install --devmode jq
fi
Expand Down Expand Up @@ -1354,6 +1358,9 @@ prepare_ubuntu_core() {
rsync_snap="test-snapd-rsync-core20"
elif os.query is-core22; then
rsync_snap="test-snapd-rsync-core22"
elif os.query is-core24; then
# TODO: publish test-snapd-rsync-core24
rsync_snap="test-snapd-rsync-core22"
fi
snap install --devmode --edge "$rsync_snap"
snap alias "$rsync_snap".rsync rsync
Expand All @@ -1365,7 +1372,7 @@ prepare_ubuntu_core() {

echo "Ensure the core snap is cached"
# Cache snaps
if os.query is-core18 || os.query is-core20 || os.query is-core22; then
if os.query is-core18 || os.query is-core20 || os.query is-core22 || os.query is-core24; then
if snap list core >& /dev/null; then
echo "core snap on core18 should not be installed yet"
snap list
Expand Down
3 changes: 3 additions & 0 deletions tests/lib/snaps/test-snapd-sh-core24/bin/sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
PS1='$ '
exec /bin/sh "$@"
8 changes: 8 additions & 0 deletions tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: test-snapd-sh-core24
version: 1.0
architectures: ["all"]
base: core24

apps:
sh:
command: bin/sh