Merge pull request canonical#1992 from mwhudson/rename-core-integrati…

…on-test rename "core" examples to "core-desktop"
Chris-Peterson444 · May 6, 2024 · b2e9393 · b2e9393
2 parents 771fc13 + d9f4f72
commit b2e9393
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/answers/core.yaml → examples/answers/core-desktop.yaml b/examples/answers/core.yaml → 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 → examples/sources/core-desktop.yaml b/examples/sources/core.yaml → examples/sources/core-desktop.yaml
diff --git 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