From a9bf5e004bb71278501089cdb94785b33f18c295 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 8 Oct 2021 13:02:55 -0600 Subject: [PATCH] sources: add sample source catalog * Add sample source catalog from impish iso * Show in dryrun * Use in one of the runtests invocations (but not really tested yet) --- Makefile | 3 ++- examples/install-sources.yaml | 23 +++++++++++++++++++++++ scripts/runtests.sh | 3 ++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100755 examples/install-sources.yaml diff --git a/Makefile b/Makefile index b5811795..f0cf1e37 100644 --- a/Makefile +++ b/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) diff --git a/examples/install-sources.yaml b/examples/install-sources.yaml new file mode 100755 index 00000000..1397b28f --- /dev/null +++ b/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 diff --git a/scripts/runtests.sh b/scripts/runtests.sh index bad3c5ff..f25f569d 100755 --- a/scripts/runtests.sh +++ b/scripts/runtests.sh @@ -75,7 +75,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"' \