Merge pull request #1092 from dbungert/source-catalog-tests

sources: add sample source catalog

Makefile

@@ -6,7 +6,8 @@ PYTHONSRC=$(NAME)
 PYTHONPATH=$(shell pwd):$(shell pwd)/probert:$(shell pwd)/curtin
 PROBERTDIR=./probert
 PROBERT_REPO=https://github.com/canonical/probert
-DRYRUN?=--dry-run --bootloader uefi --machine-config examples/simple.json
+DRYRUN?=--dry-run --bootloader uefi --machine-config examples/simple.json \
+	--source-catalog examples/install-sources.yaml
 SYSTEM_SETUP_DRYRUN?=--dry-run
 export PYTHONPATH
 CWD := $(shell pwd)

examples/install-sources.yaml

@@ -0,0 +1,23 @@
+- description:
+    en: This version has been customized to have a small runtime footprint in environments
+      where humans are not expected to log in.
+  id: ubuntu-server-minimal
+  locale_support: none
+  name:
+    en: Ubuntu Server (minimized)
+  path: ubuntu-server-minimal.squashfs
+  size: 530485248
+  type: fsimage
+  variant: server
+- default: true
+  description:
+    en: The default install contains a curated set of packages that provide a comfortable
+      experience for operating your server.
+  id: ubuntu-server
+  locale_support: locale-only
+  name:
+    en: Ubuntu Server
+  path: ubuntu-server-minimal.ubuntu-server.squashfs
+  size: 1066115072
+  type: fsimage-layered
+  variant: server

scripts/runtests.sh

@@ -90,7 +90,8 @@ done
 clean
 timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --autoinstall examples/autoinstall.yaml \
                                --dry-run --machine-config examples/existing-partitions.json --bootloader bios \
-                               --kernel-cmdline 'autoinstall'"
+                               --kernel-cmdline 'autoinstall' \
+                               --source-catalog=examples/install-sources.yaml"
 validate
 python3 scripts/check-yaml-fields.py .subiquity/subiquity-curtin-install.conf \
         debconf_selections.subiquity='"eek"' \