Differential D563

T551 adds uefi support to tests where it makes sence
ClosedPublic
Actions

Authored by pschindl on Sep 8 2015, 1:07 PM.

Details

Reviewers
adamwill
garretraziel
jskladan
Maniphest Tasks
T551: Add support for UEFI tests
Summary

Depends on D562
postinstall controll added and uefi boot needles, uefi tests added to template

Test Plan

I used ammended template to add uefi runs. Then I run few tests on uefi enabled worker. Livecds and netinst booted and installed fine with uefi. Postinstall works as expected too.

Diff Detail

Repository
rOPENQATESTS os-autoinst-distri-fedora
Branch
T551_Add_support_for_UEFI
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 189
Build 189: arc lint + arc unit
pschindl added a task: T551: Add support for UEFI tests.Sep 8 2015, 1:07 PM
pschindl retitled this revision from to T551 adds uefi support to tests where it makes sence.
pschindl updated this object.
pschindl edited the test plan for this revision. (Show Details)
pschindl added reviewers: jskladan, garretraziel, adamwill.
pschindl added a dependency: D562: T551 Add support for UEFI.
jskladan requested changes to this revision.Sep 8 2015, 2:13 PM

Moar docs pls, and check da inline comment.

tests/_boot_to_anaconda.pm
57

Pls try to hit ctrl+x in the UEFI's main menu. If that works to launch the boot process even without editing the kernel line, you could easily get rid of the && ... part of the if clause.

This revision now requires changes to proceed.Sep 8 2015, 2:13 PM
adamwill added inline comments.Sep 8 2015, 4:38 PM
tests/_boot_to_anaconda.pm
57

Also you could just unconditionally hit both every time. (And even add f10, too). Where's the harm? :)

pschindl updated this revision to Diff 1480.Sep 9 2015, 12:49 PM

As Adam suggested it now tries both ctrl+x and then return to boot

  • ctrl+x works only when it is in menu edit.

I create one needle for both Live and netinst uefi boots as Josef suggested.
It now looks for 'Test this media' text.
And I added UEFI to Test variables documentation with the note that it
is used in machine definition not in tests (usually).

jskladan accepted this revision.Sep 15 2015, 7:59 AM
This revision is now accepted and ready to land.Sep 15 2015, 7:59 AM
garretraziel accepted this revision.Sep 15 2015, 8:12 AM

Looks good to me.

needles/bootloader_uefi.json
7

Please, change this according to D577.

Revision Contents

PathPackages
MVARIABLES.md (1 line)
Mmain.pm (4 lines)
AMneedles/bootloader_uefi.json (21 lines)
AM(img)needles/bootloader_uefi.png
Mtemplates (152 lines)
Mtests/_boot_to_anaconda.pm (25 lines)
AMtests/uefi_postinstall.pm (27 lines)

Diff 1480

View Options

VARIABLES.md

Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Line(s)
64| `PARTITIONING` | string (`custom_software_raid`, `guided_delete_all`, ...) | `guided_empty` | nothing | load specified test for partitioning part (when `PARTITIONING=guided_delete_all`, `tests/disk_guided_delete_all.pm` is loaded) and optionally post-install partitioning check (if `tests/disk_guided_delete_all_postinstall.pm` exists, it will be loaded after login to the installed system). Also, if value starts with `custom_`, the `select_disks()` method will check the custom partitioning box | 64​| `PARTITIONING` | string (`custom_software_raid`, `guided_delete_all`, ...) | `guided_empty` | nothing | load specified test for partitioning part (when `PARTITIONING=guided_delete_all`, `tests/disk_guided_delete_all.pm` is loaded) and optionally post-install partitioning check (if `tests/disk_guided_delete_all_postinstall.pm` exists, it will be loaded after login to the installed system). Also, if value starts with `custom_`, the `select_disks()` method will check the custom partitioning box |
65| `ENCRYPT_PASSWORD` | string | not set | nothing | if set, encrypt disk with given password | 65​| `ENCRYPT_PASSWORD` | string | not set | nothing | if set, encrypt disk with given password |
66| `DESKTOP` | boolean | `false`/not set | nothing | set to indicate that Fedora is running with GUI (so for example OpenQA should expect graphical login screen) | 66​| `DESKTOP` | boolean | `false`/not set | nothing | set to indicate that Fedora is running with GUI (so for example OpenQA should expect graphical login screen) |
67| `ROOT_PASSWORD` | string | `weakpassword` | nothing | root password is set to this value | 67​| `ROOT_PASSWORD` | string | `weakpassword` | nothing | root password is set to this value |
68| `GRUB` | string | not set | nothing | when set, append this string to kernel line in GRUB | 68​| `GRUB` | string | not set | nothing | when set, append this string to kernel line in GRUB |
69| `USER_LOGIN` | string | not set | should be used with `USER_PASSWORD` | when set, user login is set to this value | 69​| `USER_LOGIN` | string | not set | should be used with `USER_PASSWORD` | when set, user login is set to this value |
70| `USER_PASSWORD` | string | not set | should be used with `USER_LOGIN` | when set, user password is set to this value | 70​| `USER_PASSWORD` | string | not set | should be used with `USER_LOGIN` | when set, user password is set to this value |
71| `BOOT_UPDATES_IMG_URL` | boolean | `false`/not set | set to indicate that path to updates.img was appended to kernel line | 71​| `BOOT_UPDATES_IMG_URL` | boolean | `false`/not set | set to indicate that path to updates.img was appended to kernel line |
72​| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition |
72 73​
73Run variables 74​Run variables
74------------- 75​-------------
75These variables should be set when tests are scheduled (when running `isos post`). 76​These variables should be set when tests are scheduled (when running `isos post`).
76 77​
77| Variable | Explanation | 78​| Variable | Explanation |
78| -------- | ----------- | 79​| -------- | ----------- |
79| `ISO` | contains filename of ISO that is used for booting | 80​| `ISO` | contains filename of ISO that is used for booting |
80| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) | 81​| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) |
81| `VERSION` | contains version of distribution | 82​| `VERSION` | contains version of distribution |
82| `FLAVOR` | indicates what type of distribution is used (`universal`, `generic_boot`, `workstation_live`, `server_boot`) | 83​| `FLAVOR` | indicates what type of distribution is used (`universal`, `generic_boot`, `workstation_live`, `server_boot`) |
83| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) | 84​| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) |
84| `BUILD` | contains string `vv_tt_bb`, where `vv` is fedora version number, `tt` is release name (`Beta`, `Final`, ...) and `bb` is build (`RC3`, ...) | 85​| `BUILD` | contains string `vv_tt_bb`, where `vv` is fedora version number, `tt` is release name (`Beta`, `Final`, ...) and `bb` is build (`RC3`, ...) |
View Options

main.pm

Show First 20 Lines • Show All 136 Lines • ▼ Show 20 Line(s)69{
137 # correctly, run it. Again we determine the test name based on the value 137​ # correctly, run it. Again we determine the test name based on the value
138 # of PARTITIONING 138​ # of PARTITIONING
139 my $storagepost = ''; 139​ my $storagepost = '';
140 if (get_var('PARTITIONING')) { 140​ if (get_var('PARTITIONING')) {
141 my $loc = get_var('CASEDIR')."/tests/disk_".get_var('PARTITIONING')."_postinstall.pm"; 141​ my $loc = get_var('CASEDIR')."/tests/disk_".get_var('PARTITIONING')."_postinstall.pm";
142 $storagepost = $loc if (-e $loc); 142​ $storagepost = $loc if (-e $loc);
143 } 143​ }
144 autotest::loadtest $storagepost if ($storagepost); 144​ autotest::loadtest $storagepost if ($storagepost);
145​
146​ if (get_var("UEFI")) {
147​ autotest::loadtest get_var('CASEDIR')."/tests/uefi_postinstall.pm";
148​ }
145} 149​}
146 150​
147 151​
148 152​
1491; 153​1;
150 154​
151# vim: set sw=4 et: 155​# vim: set sw=4 et:
View Options

needles/bootloader_uefi.json

  • This file was added.
1​{
2​ "tags": [
3​ "ENV-DESKTOP-gnome",
4​ "ENV-DISTRI-fedora",
5​ "ENV-FLAVOR-server_boot",
6​ "ENV-FLAVOR-workstation_live",
7​ "ENV-INSTLANG-en_US",
garretrazielUnsubmitted
Not Done

Please, change this according to D577.

8​ "ENV-UEFI-1",
9​ "bootloader_uefi"
10​ ],
11​ "area": [
12​ {
13​ "width": 140,
14​ "height": 14,
15​ "xpos": 126,
16​ "type": "match",
17​ "ypos": 140
18​ }
19​ ],
20​ "properties": []
21​}
22​No newline at end of file
View Options

needles/bootloader_uefi.png

  • This image was added.
PropertyOld ValueNew Value
MIME Typenullimage/png
File Size0 B2 KB
View Options

templates

Show All 11 Lines11 product => {
12 arch => "x86_64", 12​ arch => "x86_64",
13 distri => "fedora", 13​ distri => "fedora",
14 flavor => "workstation_live", 14​ flavor => "workstation_live",
15 version => "*", 15​ version => "*",
16 }, 16​ },
17 test_suite => { name => "default_install" }, 17​ test_suite => { name => "default_install" },
18 }, 18​ },
19 { 19​ {
20​ machine => { name => "uefi" },
21​ product => {
22​ arch => "x86_64",
23​ distri => "fedora",
24​ flavor => "workstation_live",
25​ version => "*",
26​ },
27​ test_suite => { name => "default_install" },
28​ },
29​ {
20 machine => { name => "64bit" }, 30​ machine => { name => "64bit" },
21 product => { 31​ product => {
22 arch => "x86_64", 32​ arch => "x86_64",
23 distri => "fedora", 33​ distri => "fedora",
24 flavor => "server_boot", 34​ flavor => "server_boot",
25 version => "*", 35​ version => "*",
26 }, 36​ },
27 test_suite => { name => "default_install" }, 37​ test_suite => { name => "default_install" },
28 }, 38​ },
29 { 39​ {
40​ machine => { name => "uefi" },
41​ product => {
42​ arch => "x86_64",
43​ distri => "fedora",
44​ flavor => "server_boot",
45​ version => "*",
46​ },
47​ test_suite => { name => "default_install" },
48​ },
49​ {
30 machine => { name => "64bit" }, 50​ machine => { name => "64bit" },
31 product => { 51​ product => {
32 arch => "x86_64", 52​ arch => "x86_64",
33 distri => "fedora", 53​ distri => "fedora",
34 flavor => "generic_boot", 54​ flavor => "generic_boot",
35 version => "*", 55​ version => "*",
36 }, 56​ },
37 test_suite => { name => "default_install" }, 57​ test_suite => { name => "default_install" },
38 }, 58​ },
39 { 59​ {
60​ machine => { name => "uefi" },
61​ product => {
62​ arch => "x86_64",
63​ distri => "fedora",
64​ flavor => "generic_boot",
65​ version => "*",
66​ },
67​ test_suite => { name => "default_install" },
68​ },
69​ {
40 machine => { name => "64bit" }, 70​ machine => { name => "64bit" },
41 product => { 71​ product => {
42 arch => "x86_64", 72​ arch => "x86_64",
43 distri => "fedora", 73​ distri => "fedora",
44 flavor => "universal", 74​ flavor => "universal",
45 version => "*", 75​ version => "*",
46 }, 76​ },
47 test_suite => { name => "package_set_minimal" }, 77​ test_suite => { name => "package_set_minimal" },
Show All 34 Lines111 product => {
82 arch => "x86_64", 112​ arch => "x86_64",
83 distri => "fedora", 113​ distri => "fedora",
84 flavor => "universal", 114​ flavor => "universal",
85 version => "*", 115​ version => "*",
86 }, 116​ },
87 test_suite => { name => "server_delete_pata" }, 117​ test_suite => { name => "server_delete_pata" },
88 }, 118​ },
89 { 119​ {
120​ machine => { name => "uefi" },
121​ product => {
122​ arch => "x86_64",
123​ distri => "fedora",
124​ flavor => "universal",
125​ version => "*",
126​ },
127​ test_suite => { name => "server_delete_pata" },
128​ },
129​ {
90 machine => { name => "64bit" }, 130​ machine => { name => "64bit" },
91 product => { 131​ product => {
92 arch => "x86_64", 132​ arch => "x86_64",
93 distri => "fedora", 133​ distri => "fedora",
94 flavor => "universal", 134​ flavor => "universal",
95 version => "*", 135​ version => "*",
96 }, 136​ },
97 test_suite => { name => "server_kickstart_user_creation" }, 137​ test_suite => { name => "server_kickstart_user_creation" },
Show All 14 Lines151 product => {
112 arch => "x86_64", 152​ arch => "x86_64",
113 distri => "fedora", 153​ distri => "fedora",
114 flavor => "universal", 154​ flavor => "universal",
115 version => "*", 155​ version => "*",
116 }, 156​ },
117 test_suite => { name => "server_sata_multi" }, 157​ test_suite => { name => "server_sata_multi" },
118 }, 158​ },
119 { 159​ {
160​ machine => { name => "uefi" },
161​ product => {
162​ arch => "x86_64",
163​ distri => "fedora",
164​ flavor => "universal",
165​ version => "*",
166​ },
167​ test_suite => { name => "server_sata_multi" },
168​ },
169​ {
120 machine => { name => "64bit" }, 170​ machine => { name => "64bit" },
121 product => { 171​ product => {
122 arch => "x86_64", 172​ arch => "x86_64",
123 distri => "fedora", 173​ distri => "fedora",
124 flavor => "universal", 174​ flavor => "universal",
125 version => "*", 175​ version => "*",
126 }, 176​ },
127 test_suite => { name => "server_simple_encrypted" }, 177​ test_suite => { name => "server_simple_encrypted" },
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Line(s)251 product => {
202 arch => "x86_64", 252​ arch => "x86_64",
203 distri => "fedora", 253​ distri => "fedora",
204 flavor => "universal", 254​ flavor => "universal",
205 version => "*", 255​ version => "*",
206 }, 256​ },
207 test_suite => { name => "server_no_swap" }, 257​ test_suite => { name => "server_no_swap" },
208 }, 258​ },
209 { 259​ {
260​ machine => { name => "uefi" },
261​ product => {
262​ arch => "x86_64",
263​ distri => "fedora",
264​ flavor => "universal",
265​ version => "*",
266​ },
267​ test_suite => { name => "server_simple_encrypted" },
268​ },
269​ {
270​ machine => { name => "uefi" },
271​ product => {
272​ arch => "x86_64",
273​ distri => "fedora",
274​ flavor => "universal",
275​ version => "*",
276​ },
277​ test_suite => { name => "server_simple_free_space" },
278​ },
279​ {
280​ machine => { name => "uefi" },
281​ product => {
282​ arch => "x86_64",
283​ distri => "fedora",
284​ flavor => "universal",
285​ version => "*",
286​ },
287​ test_suite => { name => "server_multi_empty" },
288​ },
289​ {
290​ machine => { name => "uefi" },
291​ product => {
292​ arch => "x86_64",
293​ distri => "fedora",
294​ flavor => "universal",
295​ version => "*",
296​ },
297​ test_suite => { name => "server_software_raid" },
298​ },
299​ {
300​ machine => { name => "uefi" },
301​ product => {
302​ arch => "x86_64",
303​ distri => "fedora",
304​ flavor => "universal",
305​ version => "*",
306​ },
307​ test_suite => { name => "server_delete_partial" },
308​ },
309​ {
310​ machine => { name => "uefi" },
311​ product => {
312​ arch => "x86_64",
313​ distri => "fedora",
314​ flavor => "universal",
315​ version => "*",
316​ },
317​ test_suite => { name => "server_btrfs" },
318​ },
319​ {
320​ machine => { name => "uefi" },
321​ product => {
322​ arch => "x86_64",
323​ distri => "fedora",
324​ flavor => "universal",
325​ version => "*",
326​ },
327​ test_suite => { name => "server_ext3" },
328​ },
329​ {
330​ machine => { name => "uefi" },
331​ product => {
332​ arch => "x86_64",
333​ distri => "fedora",
334​ flavor => "universal",
335​ version => "*",
336​ },
337​ test_suite => { name => "server_lvmthin" },
338​ },
339​ {
340​ machine => { name => "uefi" },
341​ product => {
342​ arch => "x86_64",
343​ distri => "fedora",
344​ flavor => "universal",
345​ version => "*",
346​ },
347​ test_suite => { name => "server_no_swap" },
348​ },
349​ {
210 machine => { name => "64bit" }, 350​ machine => { name => "64bit" },
211 product => { 351​ product => {
212 arch => "x86_64", 352​ arch => "x86_64",
213 distri => "fedora", 353​ distri => "fedora",
214 flavor => "universal", 354​ flavor => "universal",
215 version => "*", 355​ version => "*",
216 }, 356​ },
217 test_suite => { name => "server_kickstart_hdd" }, 357​ test_suite => { name => "server_kickstart_hdd" },
▲ Show 20 Lines • Show All 287 Lines • ▼ Show 20 Line(s)642 {
505 settings => [ 645​ settings => [
506 { key => "QEMUCPU", value => "qemu32" }, 646​ { key => "QEMUCPU", value => "qemu32" },
507 { key => "QEMUCPUS", value => "2"}, 647​ { key => "QEMUCPUS", value => "2"},
508 { key => "QEMUVGA", value => "std"}, 648​ { key => "QEMUVGA", value => "std"},
509 { key => "QEMURAM", value => "2048"} 649​ { key => "QEMURAM", value => "2048"}
510 ], 650​ ],
511 variables => "", 651​ variables => "",
512 }, 652​ },
653​ {
654​ backend => "qemu",
655​ name => "uefi",
656​ settings => [
657​ { key => "QEMUCPU", value => "qemu64" },
658​ { key => "QEMUCPUS", value => "2"},
659​ { key => "QEMUVGA", value => "std"},
660​ { key => "QEMURAM", value => "2048"},
661​ { key => "UEFI", value => "1"}
662​ ],
663​ variables => "",
664​ },
513 ], 665​ ],
514 Products => [ 666​ Products => [
515 { 667​ {
516 arch => "x86_64", 668​ arch => "x86_64",
517 distri => "fedora", 669​ distri => "fedora",
518 flavor => "universal", 670​ flavor => "universal",
519 name => "", 671​ name => "",
520 settings => [ 672​ settings => [
▲ Show 20 Lines • Show All 319 Lines • Show Last 20 Lines
View Options

tests/_boot_to_anaconda.pm

1use base "anacondatest"; 1​use base "anacondatest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5​# get_kernel_line switches to menu edit screen and sets the cursor to the end of kernel line
6​sub get_kernel_line {
7​ if( get_var("UEFI")){
8​ send_key "e";
9​ send_key "down";
10​ send_key "down";
11​ send_key "end";
12​ } else {
13​ send_key "tab";
14​ }
15​}
16​
5sub run { 17​sub run {
6 # Wait for bootloader to appear 18​ # Wait for bootloader to appear
19​ if( get_var("UEFI")){
20​ assert_screen "bootloader_uefi", 30;
21​ } else {
7 assert_screen "bootloader", 30; 22​ assert_screen "bootloader", 30;
23​ }
8 24​
9 # Make sure we skip media check if it's selected by default. Standard 25​ # Make sure we skip media check if it's selected by default. Standard
10 # 'boot installer' menu entry is always first. 26​ # 'boot installer' menu entry is always first.
11 send_key "up"; 27​ send_key "up";
12 send_key "up"; 28​ send_key "up";
13 29​
14 # if variable GRUB is set, add its value into kernel line in grub 30​ # if variable GRUB is set, add its value into kernel line in grub
15 if( get_var("GRUB")){ 31​ if( get_var("GRUB")){
16 send_key "tab"; 32​ get_kernel_line;
17 type_string " ".get_var("GRUB"); 33​ type_string " ".get_var("GRUB");
18 34​
19 } 35​ }
20 36​
21 # if variable REPOSITORY_VARIATION is set, construct inst.repo url and add it to kernel line 37​ # if variable REPOSITORY_VARIATION is set, construct inst.repo url and add it to kernel line
22 if (get_var("REPOSITORY_VARIATION")){ 38​ if (get_var("REPOSITORY_VARIATION")){
23 unless (get_var("GRUB")){ 39​ unless (get_var("GRUB")){
24 send_key "tab"; 40​ get_kernel_line;
25 } 41​ }
26 my $fedora_version = ""; 42​ my $fedora_version = "";
27 my $repourl = ""; 43​ my $repourl = "";
28 44​
29 $fedora_version = lc((split /_/, get_var("BUILD"))[0]); 45​ $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
30 46​
31 # REPOSITORY_VARIATION should be set to repository URL without version and architecture 47​ # REPOSITORY_VARIATION should be set to repository URL without version and architecture
32 # appended (it will be appended automatically) 48​ # appended (it will be appended automatically)
33 $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; 49​ $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os";
34 type_string " inst.repo=".$repourl; 50​ type_string " inst.repo=".$repourl;
35 } 51​ }
36 52​
37 # now we are on the correct "boot" menu item 53​ # now we are on the correct "boot" menu item
54​ # hit Ctrl+x for the case when the uefi kernel line was edited
55​ send_key "ctrl-x";
56​ # Return starts boot in all other cases
38 send_key "ret"; 57​ send_key "ret";
jskladanUnsubmitted
Not Done

Pls try to hit ctrl+x in the UEFI's main menu. If that works to launch the boot process even without editing the kernel line, you could easily get rid of the && ... part of the if clause.

adamwillUnsubmitted
Not Done

Also you could just unconditionally hit both every time. (And even add f10, too). Where's the harm? :)

39 58​
40 unless (get_var("KICKSTART")) 59​ unless (get_var("KICKSTART"))
41 { 60​ {
42 # on lives, we have to explicitly launch anaconda 61​ # on lives, we have to explicitly launch anaconda
43 if (get_var('LIVE')) { 62​ if (get_var('LIVE')) {
44 assert_and_click "live_initial_anaconda_launcher", '', 300; 63​ assert_and_click "live_initial_anaconda_launcher", '', 300;
45 } 64​ }
46 # wait for anaconda to appear 65​ # wait for anaconda to appear
Show All 29 Lines
View Options

tests/uefi_postinstall.pm

  • This file was added.
1​use base "installedtest";
2​use strict;
3​use testapi;
4​
5​sub run {
6​ my $self=shift;
7​ if (not( check_screen "root_console", 0)) {
8​ $self->root_console(tty=>3);
9​ }
10​ assert_screen "root_console";
11​ # this test shows if the system is booted with efi
12​ type_string 'reset; [ -d /sys/firmware/efi/ ]; echo $?';
13​ send_key "ret";
14​ assert_screen "console_command_success";
15​}
16​
17​sub test_flags {
18​ # without anything - rollback to 'lastgood' snapshot if failed
19​ # 'fatal' - whole test suite is in danger if this fails
20​ # 'milestone' - after this test succeeds, update 'lastgood'
21​ # 'important' - if this fails, set the overall state to 'fail'
22​ return { fatal => 1 };
23​}
24​
25​1;
26​
27​# vim: set sw=4 et: