Skip to content

Commit

Permalink
add an integration test to install core and some fixes
Browse files Browse the repository at this point in the history
Note that it may not be possible to create an fsimage to use as a core
installation source (haven't tried, tbh) but I have upcoming changes to
use a disk image as installation source.
  • Loading branch information
mwhudson committed Jul 19, 2023
1 parent 0b3a1c2 commit d9bda18
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 2 deletions.
24 changes: 24 additions & 0 deletions examples/answers/core.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#source-catalog: examples/sources/core.yaml
Source:
source: ubuntu-core
Welcome:
lang: en_US
Refresh:
update: no
Keyboard:
layout: us
Zdev:
accept-default: yes
Network:
accept-default: yes
Proxy:
proxy: ""
Filesystem:
guided: yes
guided-index: 0
UbuntuPro:
token: ""
InstallProgress:
reboot: yes
Drivers:
install: yes
10 changes: 10 additions & 0 deletions examples/sources/core.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- description:
en: This test source provides a "Ubuntu Core" base install
id: ubuntu-core
locale_support: none
name:
en: Ubuntu Server
path: ubuntu-core.squashfs
size: 530485248
type: fsimage
variant: core
1 change: 1 addition & 0 deletions subiquity/models/oem.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def __init__(self):
self.install_on = {
"server": False,
"desktop": True,
"core": False,
}

def make_autoinstall(self) -> Dict[str, Union[str, bool]]:
Expand Down
5 changes: 3 additions & 2 deletions subiquity/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,12 @@ def get_installer_password_from_cloudinit_log():
"filesystem",
"kernel",
"keyboard",
"mirror",
"network",
"proxy",
"source",
})
},
desktop={'mirror'},
server={'mirror'})

POSTINSTALL_MODEL_NAMES = ModelNames({
"drivers",
Expand Down

0 comments on commit d9bda18

Please sign in to comment.