vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpm: T4919: Fix TPM test for changes in 7f23b57

Browse Source
This commit is contained in:
sarthurdev 2024-09-17 11:20:09 +02:00
parent e35345a446
commit d60f5222c2
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/check-qemu-install
View File

@ -360,11 +360,15 @@ if args.qemu_cmd:
test_timeout = 3 *3600 # 3 hours (in seconds)
tpm_process = None
try:
# Start TPM emulator
if args.tpmtest:
tpm_process = start_swtpm()
#################################################
# Installing image to disk
#################################################
log.info('Installing system')
cmd = get_qemu_cmd(qemu_name, args.uefi, args.disk, raid=diskname_raid, iso_img=args.iso, vnc_enabled=args.vnc, secure_boot=args.sbtest)
cmd = get_qemu_cmd(qemu_name, args.uefi, args.disk, raid=diskname_raid, tpm=args.tpmtest, iso_img=args.iso, vnc_enabled=args.vnc, secure_boot=args.sbtest)
log.debug(f'Executing command: {cmd}')
c = pexpect.spawn(cmd, logfile=stl, timeout=60)
@ -488,12 +492,6 @@ try:
log.info('eject installation media')
os.system(f'echo "eject -f drive-cd1" | socat - unix-connect:/tmp/qemu-monitor-socket-{args.disk}')
#################################################
# Powering down installer
#################################################
if args.tpmtest:
tpm_process = start_swtpm()
#################################################
# Booting installed system
#################################################
@ -608,21 +606,8 @@ try:
c.sendline('exit')
c.expect(op_mode_prompt)
# Shutdown VM
shutdownVM(c, log, 'Shutdown VM after TPM encryption')
# Shutdown kills swtpm
tpm_process.join()
tpm_process.close()
# Start emulator again
tpm_process = start_swtpm()
# Booting back into VM
log.info('Booting TPM-backed system')
cmd = get_qemu_cmd(qemu_name, args.uefi, args.disk, raid=diskname_raid, tpm=args.tpmtest, vnc_enabled=args.vnc)
log.debug(f'Executing command: {cmd}')
c = pexpect.spawn(cmd, logfile=stl)
log.info('system installed, rebooting')
c.sendline('reboot now')
try:
c.expect('The highlighted entry will be executed automatically in', timeout=10)