StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix "make check" on uefi systems 

an ESP can be on a RAID now. Also always run the integration tests in UEFI mode.
This commit is contained in:
Michael Hudson-Doyle 2021-07-15 08:49:10 +10:00
parent 9f883ff0f7
commit 18c651343d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/runtests.sh
View File

@ -39,7 +39,7 @@ for answers in examples/answers*.yaml; do
opts='--serial' opts='--serial'
fi fi
# The --foreground is important to avoid subiquity getting SIGTTOU-ed. # The --foreground is important to avoid subiquity getting SIGTTOU-ed.
timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --answers $answers --dry-run --snaps-from-examples --machine-config $config $opts" < $tty timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --bootloader uefi --answers $answers --dry-run --snaps-from-examples --machine-config $config $opts" < $tty
validate validate
grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' .subiquity/subiquity-server-debug.log grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' .subiquity/subiquity-server-debug.log
done done

2
scripts/validate-yaml.py
View File

@ -19,7 +19,7 @@ class StorageChecker:
assert action['device'] in self.actions assert action['device'] in self.actions
assert 'ptable' in self.actions[action['device']] assert 'ptable' in self.actions[action['device']]
if action.get('flag') in ('boot', 'bios_grub', 'prep'): if action.get('flag') in ('boot', 'bios_grub', 'prep'):
assert self.actions[action['device']]['type'] == 'disk' assert self.actions[action['device']]['type'] in ('disk', 'raid')
def _check_format(self, action): def _check_format(self, action):
assert 'volume' in action assert 'volume' in action