kvm-test: have different profiles for server and desktop

Booting Desktop and server live installer ISOs comes with different
platform requirements. When running kvm-test, we now accept the name of
a profile via the --profile option.

Profiles provide default settings for memory, disk size and extra QEMU
options. For now, two profiles are hard-coded: "server" - which is the
default and "desktop".

For desktop, we use two vCPU, 8 GiB of RAM, a 20 GiB disk and pass the
-device qxl option.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2023-11-07 14:36:07 +01:00
parent 75a44b122c
commit de4e126087
1 changed files with 26 additions and 5 deletions

View File

@ -26,7 +26,6 @@ import yaml
cfg = '''
default_mem: '8G'
iso:
basedir: /srv/iso
release:
@ -43,6 +42,22 @@ iso:
'''
@dataclasses.dataclass
class Profile:
name: str
memory: str
disk_size: str
extra_qemu_options: list[str]
profiles = {
'server': Profile(name='server', memory='2G', disk_size='12G', extra_qemu_options=[]),
'desktop': Profile(name='desktop', memory='8G', disk_size='20G',
extra_qemu_options=['-device', 'qxl', '-smp', '2']),
}
def salted_crypt(plaintext_password):
# match subiquity documentation
salt = '$6$exDY1mhS4KUYCE/2'
@ -59,7 +74,9 @@ class Context:
self.config = self.load_config()
self.args = args
self.release = args.release
self.default_mem = self.config.get('default_mem', '8G')
self.default_mem = profiles[self.args.profile].memory
self.default_disk_size = profiles[self.args.profile].disk_size
self.qemu_extra_options = profiles[self.args.profile].extra_qemu_options
if not self.release:
self.release = self.config["iso"]["default"]
iso = self.config["iso"]
@ -145,8 +162,7 @@ parser.add_argument('-B', '--bios', action='store_true', default=False,
help='boot in BIOS mode (default mode is UEFI)')
parser.add_argument('-c', '--channel', action='store',
help='build iso with snap from channel')
parser.add_argument('-d', '--disksize', default='12G', action='store',
help='size of disk to create (12G default)')
parser.add_argument('-d', '--disksize', help='size of disk to create')
parser.add_argument('-i', '--img', action='store', help='use this img')
parser.add_argument('-n', '--nets', action='store', default=1, type=int,
help='''number of network interfaces.
@ -197,6 +213,8 @@ parser.add_argument('--force-no-autoinstall', default=None,
parser.add_argument('--with-tpm2', action='store_true',
help='''emulate a TPM 2.0 interface (requires swtpm
package)''')
parser.add_argument('--profile', default="server",
help='load predefined memory, disk size and qemu options')
cc_group = parser.add_mutually_exclusive_group()
@ -463,6 +481,8 @@ def kvm_prepare_common(ctx):
if ctx.args.sound:
ret.extend(('-device', 'AC97', '-device', 'usb-ehci'))
ret.extend(ctx.qemu_extra_options)
if ctx.args.with_tpm2:
tpm_emulator_context = tpm_emulator()
else:
@ -529,7 +549,8 @@ def install(ctx):
kvm.extend(drive(ctx.target))
if not os.path.exists(ctx.target) or ctx.args.overwrite:
run(f'qemu-img create -f qcow2 {ctx.target} {ctx.args.disksize}')
disksize = ctx.args.disksize or ctx.default_disk_size
run(f'qemu-img create -f qcow2 {ctx.target} {disksize}')
if len(appends) > 0:
with mounter(iso, mntdir):