Differential D562

T551 Add support for UEFI
ClosedPublic
Actions

Authored by pschindl on Sep 8 2015, 12:55 PM.

Details

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

Installation of ovmf added to worker's dockerfile and reporting amended to report uefi tests. Existence of key UEFI is tested to determine if the test uses uefi boot.

Test Plan

I run tests on uefi enabled workers and then report results to wiki. Reports went fine. All results have been reported to the right place (czeck Beta TC1 inst. wiki)

Diff Detail

Repository
rOPENQA fedora_openqa
Branch
T551_Add_support_for_UEFI
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 190
Build 190: arc lint + arc unit
pschindl added a task: T551: Add support for UEFI tests.Sep 8 2015, 12:55 PM
pschindl retitled this revision from to T551 Add support for UEFI.
pschindl updated this object.
pschindl edited the test plan for this revision. (Show Details)
pschindl added reviewers: jskladan, garretraziel, adamwill.
pschindl added a comment.Sep 8 2015, 12:59 PM

I added new variable $BOOTMETHOD$ to conf_test_suites.py to differentiate x86 BIOS and x86 UEFI columns in the wiki. UEFI tests are recognized by presence of variable UEFI in job.

jskladan requested changes to this revision.Sep 8 2015, 2:03 PM
jskladan added inline comments.
fedora_openqa_schedule/report.py
64–68

Y U No

uefi = job['settings'].has_key('UEFI')

?

80

Are you sure that all the testcases, which happen to have $RUNARCH$ also have UEFI column?
Testcase_Package_Sets_Minimal_Package_Install comes to mind as an counter-example. I understand that the testcases might not be executed with the UEFI flag set, but it makes it quite hard to devise what is happening behind the curtains.

This revision now requires changes to proceed.Sep 8 2015, 2:03 PM
adamwill added a comment.Sep 8 2015, 4:29 PM

I'd also like to see instructions added to the non-Docker README.md here, so this will work for non-Docker deployments.

fedora_openqa_schedule/report.py
80

I guess we could go with the callback function approach I used for test instance names, here.

pschindl updated this revision to Diff 1481.Sep 9 2015, 1:41 PM

InstallGuide updated, variable for reporting added

Install Guide now explains how to add qemu-ovmf

Variable for reporting results with just i386 and x86_64 columns added.

Explaining comment added for env variables.

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

Revision Contents

Diff 1481

View Options

InstallGuide.md

Show All 17 Lines171. become a root
18 18​
19 sudo su - 19​ sudo su -
20 20​
212. add repos 21​2. add repos
22 22​
23 zypper ar -f http://download.opensuse.org/repositories/devel:openQA:stable/openSUSE_13.2/devel:openQA:stable.repo 23​ zypper ar -f http://download.opensuse.org/repositories/devel:openQA:stable/openSUSE_13.2/devel:openQA:stable.repo
24 zypper ar -f obs://devel:openQA/openSUSE_13.2 openQA 24​ zypper ar -f obs://devel:openQA/openSUSE_13.2 openQA
25 zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules 25​ zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules
26​ zypper ar -f obs://Virtualization/openSUSE_13.2 Virtualization
26 27​
273. install OpenQA 28​3. install OpenQA and ovmf (for UEFI testing)
28 29​
29 zypper in openQA 30​ zypper in openQA
30 zypper in openQA-worker 31​ zypper in openQA-worker
32​ zypper in --from Virtualization qemu-ovmf-x86_64
31 33​
324. create filesystem layout 34​4. create filesystem layout
33 35​
34 cd /var/lib/openqa 36​ cd /var/lib/openqa
35 mkdir factory/hdd 37​ mkdir factory/hdd
36 38​
375. setup apache 39​5. setup apache
38 40​
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines
View Options

docker/worker/Dockerfile

1FROM opensuse:13.2 1​FROM opensuse:13.2
2MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com> 2​MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>
3 3​
4RUN useradd -m geekotest && \ 4​RUN useradd -m geekotest && \
5 zypper --non-interactive --gpg-auto-import-keys in ca-certificates-mozilla curl && \ 5​ zypper --non-interactive --gpg-auto-import-keys in ca-certificates-mozilla curl && \
6 zypper ar -f http://download.opensuse.org/repositories/devel:openQA:stable/openSUSE_13.2/devel:openQA:stable.repo && \ 6​ zypper ar -f http://download.opensuse.org/repositories/devel:openQA:stable/openSUSE_13.2/devel:openQA:stable.repo && \
7 zypper ar -f obs://devel:openQA/openSUSE_13.2 openQA && \ 7​ zypper ar -f obs://devel:openQA/openSUSE_13.2 openQA && \
8 zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \ 8​ zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \
9​ zypper ar -f obs://Virtualization/openSUSE_13.2 Virtualization && \
9 curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/pubkey && rpm --import /tmp/pubkey && \ 10​ curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/pubkey && rpm --import /tmp/pubkey && \
11​ curl https://build.opensuse.org/source/Virtualization/_pubkey > /tmp/virt_pubkey && rpm --import /tmp/virt_pubkey && \
10 zypper --non-interactive in --from devel_openQA_stable openQA-worker qemu-kvm && \ 12​ zypper --non-interactive in --from devel_openQA_stable openQA-worker qemu-kvm && \
11 zypper --non-interactive in kmod 13​ zypper --non-interactive in kmod && \
14​ zypper --non-interactive in --from Virtualization qemu-ovmf-x86_64
12 15​
13# set-up qemu 16​# set-up qemu
14RUN mkdir -p /root/qemu 17​RUN mkdir -p /root/qemu
15ADD kvm-mknod.sh /root/qemu/kvm-mknod.sh 18​ADD kvm-mknod.sh /root/qemu/kvm-mknod.sh
16RUN chmod +x /root/qemu/*.sh && /root/qemu/kvm-mknod.sh && \ 19​RUN chmod +x /root/qemu/*.sh && /root/qemu/kvm-mknod.sh && \
17 # set-up shared data and configuration 20​ # set-up shared data and configuration
18 rm -rf /etc/openqa/client.conf /etc/openqa/workers.ini \ 21​ rm -rf /etc/openqa/client.conf /etc/openqa/workers.ini \
19 /var/lib/openqa/pool && \ 22​ /var/lib/openqa/pool && \
Show All 9 Lines
View Options

fedora_openqa_schedule/conf_test_suites.py

Show All 27 Lines26def default_install_cb(flavor):
28 install pass for a given flavor. 28​ install pass for a given flavor.
29 """ 29​ """
30 (payload, imagetype) = flavor.split('_') 30​ (payload, imagetype) = flavor.split('_')
31 imagetype = imagetype.replace('boot', 'netinst') 31​ imagetype = imagetype.replace('boot', 'netinst')
32 imagetype = imagetype.replace('dvd', 'offline') 32​ imagetype = imagetype.replace('dvd', 'offline')
33 return "{0} {1}".format(payload, imagetype) 33​ return "{0} {1}".format(payload, imagetype)
34 34​
35TESTCASES = { 35​TESTCASES = {
36​ # env: variable - columns in table
37​ # $RUNARCH_OR_UEFI$ - i386, x86_64, UEFI
38​ # $RUNARCH$ - i386, x86_64
39​ # $BOOTMETHOD$ - x86 BIOS, x86 UEFI
40​
36 "QA:Testcase_Boot_default_install": { 41​ "QA:Testcase_Boot_default_install": {
37 "name_cb": default_install_cb, 42​ "name_cb": default_install_cb,
38 "section": 'Default boot and install', 43​ "section": 'Default boot and install',
39 "env": "$RUNARCH$", 44​ "env": "$RUNARCH_OR_UEFI$",
40 "type": "Installation", 45​ "type": "Installation",
41 }, 46​ },
42 "QA:Testcase_install_to_VirtIO": { 47​ "QA:Testcase_install_to_VirtIO": {
43 "section": "Storage devices", 48​ "section": "Storage devices",
44 "env": "x86", 49​ "env": "x86",
45 "type": "Installation", 50​ "type": "Installation",
46 }, 51​ },
47 "QA:Testcase_partitioning_guided_empty": { 52​ "QA:Testcase_partitioning_guided_empty": {
48 "section": "Guided storage configuration", 53​ "section": "Guided storage configuration",
49 "env": "x86 BIOS", 54​ "env": "$BOOTMETHOD$",
50 "type": "Installation", 55​ "type": "Installation",
51 }, 56​ },
52 "QA:Testcase_Anaconda_User_Interface_Graphical": { 57​ "QA:Testcase_Anaconda_User_Interface_Graphical": {
53 "section": "User interface", 58​ "section": "User interface",
54 "env": "Result", 59​ "env": "Result",
55 "type": "Installation", 60​ "type": "Installation",
56 }, 61​ },
57 "QA:Testcase_Anaconda_user_creation": { 62​ "QA:Testcase_Anaconda_user_creation": {
58 "section": "Miscellaneous", 63​ "section": "Miscellaneous",
59 "env": "x86", 64​ "env": "x86",
60 "type": "Installation", 65​ "type": "Installation",
61 }, 66​ },
62 "QA:Testcase_install_to_PATA": { 67​ "QA:Testcase_install_to_PATA": {
63 "section": "Storage devices", 68​ "section": "Storage devices",
64 "env": "x86", 69​ "env": "x86",
65 "type": "Installation", 70​ "type": "Installation",
66 }, 71​ },
67 "QA:Testcase_partitioning_guided_delete_all": { 72​ "QA:Testcase_partitioning_guided_delete_all": {
68 "section": "Guided storage configuration", 73​ "section": "Guided storage configuration",
69 "env": "x86 BIOS", 74​ "env": "$BOOTMETHOD$",
70 "type": "Installation", 75​ "type": "Installation",
71 }, 76​ },
72 "QA:Testcase_install_to_SATA": { 77​ "QA:Testcase_install_to_SATA": {
73 "section": "Storage devices", 78​ "section": "Storage devices",
74 "env": "x86", 79​ "env": "x86",
75 "type": "Installation", 80​ "type": "Installation",
76 }, 81​ },
77 "QA:Testcase_partitioning_guided_multi_select": { 82​ "QA:Testcase_partitioning_guided_multi_select": {
78 "section": "Guided storage configuration", 83​ "section": "Guided storage configuration",
79 "env": "x86 BIOS", 84​ "env": "$BOOTMETHOD$",
80 "type": "Installation", 85​ "type": "Installation",
81 }, 86​ },
82 "QA:Testcase_install_to_SCSI": { 87​ "QA:Testcase_install_to_SCSI": {
83 "section": "Storage devices", 88​ "section": "Storage devices",
84 "env": "x86", 89​ "env": "x86",
85 "type": "Installation", 90​ "type": "Installation",
86 }, 91​ },
87 "QA:Testcase_Anaconda_updates.img_via_URL": { 92​ "QA:Testcase_Anaconda_updates.img_via_URL": {
Show All 28 Lines
116 }, 121​ },
117 "QA:Testcase_Package_Sets_Minimal_Package_Install": { 122​ "QA:Testcase_Package_Sets_Minimal_Package_Install": {
118 "section": "Package sets", 123​ "section": "Package sets",
119 "env": "$RUNARCH$", 124​ "env": "$RUNARCH$",
120 "type": "Installation", 125​ "type": "Installation",
121 }, 126​ },
122 "QA:Testcase_partitioning_guided_encrypted": { 127​ "QA:Testcase_partitioning_guided_encrypted": {
123 "section": "Guided storage configuration", 128​ "section": "Guided storage configuration",
124 "env": "x86 BIOS", 129​ "env": "$BOOTMETHOD$",
125 "type": "Installation", 130​ "type": "Installation",
126 }, 131​ },
127 "QA:Testcase_partitioning_guided_delete_partial": { 132​ "QA:Testcase_partitioning_guided_delete_partial": {
128 "section": "Guided storage configuration", 133​ "section": "Guided storage configuration",
129 "env": "x86 BIOS", 134​ "env": "$BOOTMETHOD$",
130 "type": "Installation", 135​ "type": "Installation",
131 }, 136​ },
132 "QA:Testcase_partitioning_guided_free_space": { 137​ "QA:Testcase_partitioning_guided_free_space": {
133 "section": "Guided storage configuration", 138​ "section": "Guided storage configuration",
134 "env": "x86 BIOS", 139​ "env": "$BOOTMETHOD$",
135 "type": "Installation", 140​ "type": "Installation",
136 }, 141​ },
137 "QA:Testcase_partitioning_guided_multi_empty_all": { 142​ "QA:Testcase_partitioning_guided_multi_empty_all": {
138 "section": "Guided storage configuration", 143​ "section": "Guided storage configuration",
139 "env": "x86 BIOS", 144​ "env": "$BOOTMETHOD$",
140 "type": "Installation", 145​ "type": "Installation",
141 }, 146​ },
142 "QA:Testcase_partitioning_custom_software_RAID": { 147​ "QA:Testcase_partitioning_custom_software_RAID": {
143 "section": "Custom storage configuration", 148​ "section": "Custom storage configuration",
144 "env": "x86 BIOS", 149​ "env": "$BOOTMETHOD$",
145 "type": "Installation", 150​ "type": "Installation",
146 }, 151​ },
147 "QA:Testcase_partitioning_custom_btrfs": { 152​ "QA:Testcase_partitioning_custom_btrfs": {
148 "section": "Custom storage configuration", 153​ "section": "Custom storage configuration",
149 "env": "x86 BIOS", 154​ "env": "$BOOTMETHOD$",
150 "type": "Installation", 155​ "type": "Installation",
151 }, 156​ },
152 "QA:Testcase_partitioning_custom_lvmthin": { 157​ "QA:Testcase_partitioning_custom_lvmthin": {
153 "section": "Custom storage configuration", 158​ "section": "Custom storage configuration",
154 "env": "x86 BIOS", 159​ "env": "$BOOTMETHOD$",
155 "type": "Installation", 160​ "type": "Installation",
156 }, 161​ },
157 "QA:Testcase_partitioning_custom_standard_partition_ext3": { 162​ "QA:Testcase_partitioning_custom_standard_partition_ext3": {
158 "section": "Custom storage configuration", 163​ "section": "Custom storage configuration",
159 "env": "x86 BIOS", 164​ "env": "$BOOTMETHOD$",
160 "type": "Installation", 165​ "type": "Installation",
161 }, 166​ },
162 "QA:Testcase_partitioning_custom_no_swap": { 167​ "QA:Testcase_partitioning_custom_no_swap": {
163 "section": "Custom storage configuration", 168​ "section": "Custom storage configuration",
164 "env": "x86 BIOS", 169​ "env": "$BOOTMETHOD$",
165 "type": "Installation", 170​ "type": "Installation",
166 }, 171​ },
167 "QA:Testcase_Kickstart_Hd_Device_Path_Ks_Cfg": { 172​ "QA:Testcase_Kickstart_Hd_Device_Path_Ks_Cfg": {
168 "section": "Kickstart", 173​ "section": "Kickstart",
169 "env": "Result", 174​ "env": "Result",
170 "type": "Installation", 175​ "type": "Installation",
171 }, 176​ },
172 "QA:Testcase_upgrade_fedup_cli_previous_minimal": { 177​ "QA:Testcase_upgrade_fedup_cli_previous_minimal": {
173 "section": "Upgrade", 178​ "section": "Upgrade",
174 "env": "x86 BIOS", 179​ "env": "$BOOTMETHOD$",
175 "type": "Installation", 180​ "type": "Installation",
176 }, 181​ },
177 "QA:Testcase_upgrade_fedup_cli_previous_workstation": { 182​ "QA:Testcase_upgrade_fedup_cli_previous_workstation": {
178 "section": "Upgrade", 183​ "section": "Upgrade",
179 "env": "x86 BIOS", 184​ "env": "$BOOTMETHOD$",
180 "type": "Installation", 185​ "type": "Installation",
181 }, 186​ },
182 "QA:Testcase_Anaconda_updates.img_via_local_media": { 187​ "QA:Testcase_Anaconda_updates.img_via_local_media": {
183 "section": "Miscellaneous", 188​ "section": "Miscellaneous",
184 "env": "Result", 189​ "env": "Result",
185 "type": "Installation", 190​ "type": "Installation",
186 }, 191​ },
187 # "": { 192​ # "": {
▲ Show 20 Lines • Show All 173 Lines • Show Last 20 Lines
View Options

fedora_openqa_schedule/report.py

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)47def get_passed_testcases(job_ids, waittime=None):
56 # raise an openQA client error on wait expiry. 56​ # raise an openQA client error on wait expiry.
57 client = OpenQA_Client() 57​ client = OpenQA_Client()
58 jobs = client.wait_jobs(job_ids, waittime=waittime) 58​ jobs = client.wait_jobs(job_ids, waittime=waittime)
59 passed_testcases = set() 59​ passed_testcases = set()
60 for job in jobs: 60​ for job in jobs:
61 if job['result'] == 'passed': 61​ if job['result'] == 'passed':
62 (release, milestone, compose) = job['settings']['BUILD'].split('_') 62​ (release, milestone, compose) = job['settings']['BUILD'].split('_')
63 testsuite = job['settings']['TEST'] 63​ testsuite = job['settings']['TEST']
64​ # We need to differentiate tests with UEFI from BIOS
65​ uefi = job['settings'].has_key('UEFI')
64 arch = job['settings']['ARCH'] 66​ arch = job['settings']['ARCH']
65 flavor = job['settings']['FLAVOR'] 67​ flavor = job['settings']['FLAVOR']
66 68​
jskladanUnsubmitted
Not Done

Y U No

uefi = job['settings'].has_key('UEFI')

?

67 for testcase in conf_test_suites.TESTSUITES[testsuite]: 69​ for testcase in conf_test_suites.TESTSUITES[testsuite]:
68 # each 'testsuite' is a list using testcase names to indicate which Wikitcms tests 70​ # each 'testsuite' is a list using testcase names to indicate which Wikitcms tests
69 # have passed if this job passes. Each testcase name is the name of a dict in the 71​ # have passed if this job passes. Each testcase name is the name of a dict in the
70 # TESTCASES dict-of-dicts which more precisely identifies the 'test instance' (when 72​ # TESTCASES dict-of-dicts which more precisely identifies the 'test instance' (when
71 # there is more than one for a testcase) and environment for which the result 73​ # there is more than one for a testcase) and environment for which the result
72 # should be filed. 74​ # should be filed.
73 uniqueres = conf_test_suites.TESTCASES[testcase] 75​ uniqueres = conf_test_suites.TESTCASES[testcase]
74 testname = '' 76​ testname = ''
75 if 'name_cb' in uniqueres: 77​ if 'name_cb' in uniqueres:
76 testname = uniqueres['name_cb'](flavor) 78​ testname = uniqueres['name_cb'](flavor)
77 env = arch if uniqueres['env'] == '$RUNARCH$' else uniqueres['env'] 79​ # Decide what column should be used for report.
80​ # Testcases with more columns now have to use $variable$ so it
jskladanUnsubmitted
Not Done

Are you sure that all the testcases, which happen to have $RUNARCH$ also have UEFI column?
Testcase_Package_Sets_Minimal_Package_Install comes to mind as an counter-example. I understand that the testcases might not be executed with the UEFI flag set, but it makes it quite hard to devise what is happening behind the curtains.

adamwillUnsubmitted
Not Done

I guess we could go with the callback function approach I used for test instance names, here.

81​ # could be decided where to report the result
82​ if uniqueres['env'] == '$RUNARCH_OR_UEFI$':
83​ env = 'UEFI' if uefi else arch
84​ elif uniqueres['env'] == '$RUNARCH$':
85​ env = arch
86​ elif uniqueres['env'] == '$BOOTMETHOD$':
87​ env = 'x86 UEFI' if uefi else 'x86 BIOS'
88​ else:
89​ env = uniqueres['env']
78 result = ResTuple( 90​ result = ResTuple(
79 testtype=uniqueres['type'], release=release, milestone=milestone, 91​ testtype=uniqueres['type'], release=release, milestone=milestone,
80 compose=compose, testcase=testcase, section=uniqueres['section'], 92​ compose=compose, testcase=testcase, section=uniqueres['section'],
81 testname=testname, env=env, status='pass', bot=True) 93​ testname=testname, env=env, status='pass', bot=True)
82 passed_testcases.add(result) 94​ passed_testcases.add(result)
83 95​
84 return sorted(list(passed_testcases), key=attrgetter('testcase')) 96​ return sorted(list(passed_testcases), key=attrgetter('testcase'))
85 97​
Show All 30 Lines