From 6d2d5c34800bbfb1627b472c2b78869e6706c67c Mon Sep 17 00:00:00 2001
From: Valentin David <valentin.david@canonical.com>
Date: Wed, 23 Nov 2022 13:30:28 +0100
Subject: [PATCH] spread: add external:ubuntu-core-24-64

This is needed by core-base CI.
---
 spread.yaml                                         | 3 +++
 tests/lib/prepare.sh                                | 9 ++++++++-
 tests/lib/snaps/test-snapd-sh-core24/bin/sh         | 3 +++
 tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml | 8 ++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 tests/lib/snaps/test-snapd-sh-core24/bin/sh
 create mode 100644 tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml

diff --git a/spread.yaml b/spread.yaml
index f8493057f71..f9e4682f50c 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -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
 
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 819235218d3..13a043a348b 100755
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -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
+        snap alias jq-core22.jq jq
     else
         snap install --devmode jq
     fi
@@ -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
@@ -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
diff --git a/tests/lib/snaps/test-snapd-sh-core24/bin/sh b/tests/lib/snaps/test-snapd-sh-core24/bin/sh
new file mode 100755
index 00000000000..0f845e07c5a
--- /dev/null
+++ b/tests/lib/snaps/test-snapd-sh-core24/bin/sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+PS1='$ '
+exec /bin/sh "$@"
diff --git a/tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml b/tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml
new file mode 100644
index 00000000000..b016948a8bd
--- /dev/null
+++ b/tests/lib/snaps/test-snapd-sh-core24/meta/snap.yaml
@@ -0,0 +1,8 @@
+name: test-snapd-sh-core24
+version: 1.0
+architectures: ["all"]
+base: core24
+
+apps:
+    sh:
+        command: bin/sh