PR#129: Add uefi variations of the minimal upgrade test case. - fedora-qa/os-autoinst-distri-fedora

fedora-qa / os-autoinst-distri-fedora

#129 Add uefi variations of the minimal upgrade test case.

Merged 4 years ago by adamwill. Opened 4 years ago by lruzicka.

upgrade_minimal_uefi into master

Add uefi variations of the minimal upgrade test case.

Lukáš Růžička • 4 years ago

5a28c0c

templates

file modified

+44

		`@@ -1548,6 +1548,17 @@`
		`test_suite => { name => "upgrade_minimal_64bit" },`
		`},`
		`{`
		`+ machine => { name => "uefi" },`
		`+ prio => 30,`
		`+ product => {`
		`+ arch => "x86_64",`
		`+ distri => "fedora",`
		`+ flavor => "universal",`
		`+ version => "*",`
		`+ },`
		`+ test_suite => { name => "upgrade_minimal_uefi" },`
		`+ },`
		`+ {`
		`machine => { name => "64bit" },`
		`prio => 30,`
		`product => {`
		`@@ -1625,6 +1636,17 @@`
		`test_suite => { name => "upgrade_2_minimal_64bit" },`
		`},`
		`{`
		`+ machine => { name => "uefi" },`
		`+ prio => 40,`
		`+ product => {`
		`+ arch => "x86_64",`
		`+ distri => "fedora",`
		`+ flavor => "universal",`
		`+ version => "*",`
		`+ },`
		`+ test_suite => { name => "upgrade_2_minimal_uefi" },`
		`+ },`
		`+ {`
		`machine => { name => "64bit" },`
		`prio => 40,`
		`product => {`
		`@@ -5017,6 +5039,17 @@`
		`],`
		`},`
		`{`
		`+ name => "upgrade_minimal_uefi",`
		`+ settings => [`
		`+ { key => "ROOT_PASSWORD", value => "weakpassword" },`
		`+ { key => "USER_LOGIN", value => "false" },`
		`+ { key => "BOOTFROM", value => "c" },`
		`+ { key => "HDD_1", value => "disk_f%CURRREL%_minimal-uefi_3_%ARCH%.img" },`
		`+ { key => "UPGRADE", value => "1" },`
		`+ { key => "TEST_TARGET", value => "COMPOSE" },`
		`+ ],`
		`+ },`
		`+ {`
		`name => "upgrade_desktop_64bit",`
		`settings => [`
		`{ key => "ROOT_PASSWORD", value => "weakpassword" },`
		`@@ -5118,6 +5151,17 @@`
		`],`
		`},`
		`{`
		`+ name => "upgrade_2_minimal_uefi",`
		`+ settings => [`
		`+ { key => "ROOT_PASSWORD", value => "weakpassword" },`
		`+ { key => "USER_LOGIN", value => "false" },`
		`+ { key => "BOOTFROM", value => "c" },`
		`+ { key => "HDD_1", value => "disk_f%PREVREL%_minimal-uefi_3_%ARCH%.img" },`
		`+ { key => "UPGRADE", value => "1" },`
		`+ { key => "TEST_TARGET", value => "COMPOSE" },`
		`+ ],`
		`+ },`
		`+ {`
		`name => "upgrade_2_desktop_64bit",`
		`settings => [`
		`{ key => "ROOT_PASSWORD", value => "weakpassword" },`

lruzicka commented 4 years ago

I have added the uefi option to the template, because @frantisekz realized that coconut does not run them when they could be run. I believe that this is all you need to do to automate https://fedoraproject.org/wiki/QA:Testcase_upgrade_dnf_current_any for UEFI, because these tests are already performed for BIOS. Is anything else necessary?

Metadata Update from @lruzicka:
- Request assigned

4 years ago

adamwill commented 4 years ago

No, I think that should be all. I don't recall if there's a reason we never did this, but it seems useful, just in case there are bootloader issues on upgrade...

rebased onto e34eb07c55e542caca18162318e992b61b217df4

4 years ago

adamwill commented 4 years ago

Oh, okay, yeah, no, now I know why - I just tried it and it doesn't work. It doesn't work because the canned disk images produced by createhdds are only BIOS bootable, they are not UEFI bootable. I don't know if virt-install is capable of producing UEFI bootable images, if it is, we can do this, but we would need additional base disk images and there'd be a bit more work to tweak the templates to use the appropriate base image for the machine type.

adamwill commented 4 years ago

Per https://fedoraproject.org/wiki/Using_UEFI_with_QEMU#virt-install you can do it with virt-install, so if you still want to do this, you'll need to send a PR for createhdds to produce a UEFI version of the minimal disk image and to change the image names to include the machine type, then revise this PR to also change the expected disk image name for all tests that use the minimal image to include the machine type.

lruzicka commented 4 years ago

Thanks, I will try try to do it.

rebased onto 3806c2738b0c2e93fbfaf0630492bde9a4cb8c79

4 years ago

1 new commit added

Add new test suites.

4 years ago

rebased onto 13d3582039b66c07ad519c8296a5e2d58796fea6

4 years ago

lruzicka commented 4 years ago

With the tweaking of createhdds.py that has already been merged, it is possible to create UEFI based machines, that can be used for upgrade tests by adding two new test suites and two more jobs. I will try to test on staging.

lruzicka commented 4 years ago

I added two suites and two jobs finally and it can be run and passes on my machine. Unfortunately, I was not able to run this on staging. I was able to create the image using createhdds.py but I could not start the tests, because it complained about missing composes or unavailable images.

rebased onto 99bef4f5a658b7a859df9c3ca82b0eaaa26e1337

4 years ago

adamwill commented 4 years ago

I'll take a look at this tomorrow, for now i'll put staging back on master. I've rebased this on master.

rebased onto 9b428288496171bd797a38c8f05f0437704eb754

4 years ago

rebased onto fe7c7ba478e616222618ff3a8d1644d9737b95d2

4 years ago

rebased onto 5a28c0c

4 years ago

adamwill commented 4 years ago

I tested this and it works fine, not sure why your tests didn't work (they seem to have been looking for the wrong disk image file name for some reason). I tweaked it a bit to drop the '_64bit' from the names (it's not necessary, in fact we could go back and strip it from all the other upgrade tests now too probably...) and will merge it, thanks.