From d9f4f721fb8bdc677ac1634b47dc3c90d238ffa3 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 6 May 2024 14:38:55 +0200
Subject: [PATCH] rename "core" examples to "core-desktop"

We'll hopefully be able to install other kinds of core system soon.
---
 examples/answers/{core.yaml => core-desktop.yaml} | 2 +-
 examples/sources/{core.yaml => core-desktop.yaml} | 0
 scripts/runtests.sh                               | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename examples/answers/{core.yaml => core-desktop.yaml} (85%)
 rename examples/sources/{core.yaml => core-desktop.yaml} (100%)

diff --git a/examples/answers/core.yaml b/examples/answers/core-desktop.yaml
similarity index 85%
rename from examples/answers/core.yaml
rename to examples/answers/core-desktop.yaml
index df48bd8b..ac9127f0 100644
--- a/examples/answers/core.yaml
+++ b/examples/answers/core-desktop.yaml
@@ -1,4 +1,4 @@
-#source-catalog: examples/sources/core.yaml
+#source-catalog: examples/sources/core-desktop.yaml
 Source:
   source: ubuntu-core
 Welcome:
diff --git a/examples/sources/core.yaml b/examples/sources/core-desktop.yaml
similarity index 100%
rename from examples/sources/core.yaml
rename to examples/sources/core-desktop.yaml
diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index fd2130c3..770530ab 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -39,7 +39,7 @@ validate () {
             autoinstall-reset-only)
                 python3 scripts/validate-yaml.py --no-root-mount "${cfgs[@]}"
                 ;;
-            answers-core)
+            answers-core-desktop)
                 ;;
             *)
                 python3 scripts/validate-yaml.py "${cfgs[@]}"
@@ -50,7 +50,7 @@ validate () {
             exit 1
         fi
         case $testname in
-            answers-core)
+            answers-core-desktop)
                 ;;
             *)
                 python3 scripts/validate-autoinstall-user-data.py < $tmpdir/var/log/installer/autoinstall-user-data
@@ -223,7 +223,7 @@ for answers in examples/answers/*.yaml; do
             --snaps-from-examples \
             --source-catalog $catalog
         validate install
-        if [ $answers != examples/answers/core.yaml ]; then
+        if [ $answers != examples/answers/core-desktop.yaml ]; then
             grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' $tmpdir/subiquity-server-debug.log
         fi
     else