Differential D860

add base_services_start test for ARM
ClosedPublic
Actions

Authored by garretraziel on May 24 2016, 11:51 AM.

Details

Reviewers
adamwill
jskladan
Commits
rOPENQA69aedcf97a18: add base_services_start test for ARM
Summary

This adds base_services_start handling for ARM. There are two problems
this DR solves. First is that we can't really use HDD_1_DECOMPRESS_URL for posting,
because it overwrites HDD_1 set in consecutive test. We use rather ugly hack that
we set HDD_2_DECOMPRESS_URL instead, set NUMDISKS=1, HDD_1=%HDD_2% for first
test and HDD_1 correctly for second test, see https://github.com/os-autoinst/openQA/issues/684.

Second problem is that in Base test matrix, tests are partitioned by subvariant,
ARM being exception. This introduces new "report variable" $SUBVARIANT_OR_ARM$.

Test Plan

run base_services_start_arm, try to report to wiki

Diff Detail

Repository
rOPENQA fedora_openqa
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
garretraziel retitled this revision from to add base_services_start test for ARM.May 24 2016, 11:51 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: adamwill, jskladan.
adamwill accepted this revision.May 24 2016, 2:36 PM

Please document $SUBVARIANT_OR_ARM$ in the comments at the top of TESTCASES, like all the others. With that and the other comment, though, this looks OK.

scheduler/fedora_openqa_schedule/schedule.py
45–46

the word "it" is wrong here, I think. Do you mean "Let's connect it as second HDD"?

This revision is now accepted and ready to land.May 24 2016, 2:36 PM
Closed by commit rOPENQA69aedcf97a18: add base_services_start test for ARM (authored by garretraziel). · Explain WhyMay 27 2016, 10:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2231

View Options

scheduler/fedora_openqa_schedule/conf_test_suites.py

Show All 24 Lines
25 25​
26TESTCASES = { 26​TESTCASES = {
27 # the following strings in values will be replaced with strings 27​ # the following strings in values will be replaced with strings
28 # derived from openQA job settings, this is used for e.g. to get 28​ # derived from openQA job settings, this is used for e.g. to get
29 # the correct 'environment' or 'testname'. 29​ # the correct 'environment' or 'testname'.
30 # 30​ #
31 # special value replacement 31​ # special value replacement
32 # 32​ #
33 # $RUNARCH_OR_UEFI$ - "i386", "x86_64", or "UEFI" for x86_64 UEFI 33​ # $RUNARCH_OR_UEFI$ - "i386", "x86_64", or "UEFI" for x86_64 UEFI
34 # $RUNARCH$ - "i386", "x86_64" 34​ # $RUNARCH$ - "i386", "x86_64"
35 # $BOOTMETHOD$ - "x86_64 BIOS", "x86_64 UEFI" 35​ # $BOOTMETHOD$ - "x86_64 BIOS", "x86_64 UEFI"
36 # $SUBVARIANT$ - productmd 'subvariant': "Server", "KDE"... "_Base" is stripped 36​ # $SUBVARIANT$ - productmd 'subvariant': "Server", "KDE"... "_Base" is stripped
37 # $IMAGETYPE$ - pungi 'type': "boot", "live"... "boot" -> "netinst" 37​ # $SUBVARIANT_OR_ARM$ - productmd 'subvariant' as above, or "ARM" when running on ARM architecture
38 # $FS$ - filesystem: "ext3", "btrfs"... expected to be last element of openQA test name 38​ # $IMAGETYPE$ - pungi 'type': "boot", "live"... "boot" -> "netinst"
39 # $DESKTOP$ - desktop: just the DESKTOP openQA setting 39​ # $FS$ - filesystem: "ext3", "btrfs"... expected to be last element of openQA test name
40​ # $DESKTOP$ - desktop: just the DESKTOP openQA setting
40 41​
41 "QA:Testcase_Boot_default_install": { 42​ "QA:Testcase_Boot_default_install": {
42 "name": "$SUBVARIANT$_$IMAGETYPE$", 43​ "name": "$SUBVARIANT$_$IMAGETYPE$",
43 "section": 'Default boot and install', 44​ "section": 'Default boot and install',
44 "env": "$RUNARCH_OR_UEFI$", 45​ "env": "$RUNARCH_OR_UEFI$",
45 "type": "Installation", 46​ "type": "Installation",
46 }, 47​ },
47 "QA:Testcase_arm_image_deployment": { 48​ "QA:Testcase_arm_image_deployment": {
▲ Show 20 Lines • Show All 202 Lines • ▼ Show 20 Line(s)249 "QA:Testcase_Package_Sets_KDE_Package_Install": {
250 "env": "$RUNARCH$", 251​ "env": "$RUNARCH$",
251 "type": "Installation", 252​ "type": "Installation",
252 }, 253​ },
253 "QA:Testcase_base_selinux": { 254​ "QA:Testcase_base_selinux": {
254 "env": "$SUBVARIANT$", 255​ "env": "$SUBVARIANT$",
255 "type": "Base", 256​ "type": "Base",
256 }, 257​ },
257 "QA:Testcase_Services_start": { 258​ "QA:Testcase_Services_start": {
258 "env": "$SUBVARIANT$", 259​ "env": "$SUBVARIANT_OR_ARM$",
259 "type": "Base", 260​ "type": "Base",
260 }, 261​ },
261 "QA:Testcase_base_service_manipulation": { 262​ "QA:Testcase_base_service_manipulation": {
262 "env": "$SUBVARIANT$", 263​ "env": "$SUBVARIANT$",
263 "type": "Base", 264​ "type": "Base",
264 }, 265​ },
265 "QA:Testcase_kickstart_firewall_disabled": { 266​ "QA:Testcase_kickstart_firewall_disabled": {
266 "env": "x86", 267​ "env": "x86",
▲ Show 20 Lines • Show All 286 Lines • ▼ Show 20 Line(s)550 "install_package_set_kde": [
553 "QA:Testcase_Package_Sets_KDE_Package_Install", 554​ "QA:Testcase_Package_Sets_KDE_Package_Install",
554 ], 555​ ],
555 "base_selinux": [ 556​ "base_selinux": [
556 "QA:Testcase_base_selinux", 557​ "QA:Testcase_base_selinux",
557 ], 558​ ],
558 "base_services_start": [ 559​ "base_services_start": [
559 "QA:Testcase_Services_start", 560​ "QA:Testcase_Services_start",
560 ], 561​ ],
562​ "base_services_start_arm": [
563​ "QA:Testcase_Services_start",
564​ ],
561 "base_service_manipulation": [ 565​ "base_service_manipulation": [
562 "QA:Testcase_base_service_manipulation", 566​ "QA:Testcase_base_service_manipulation",
563 ], 567​ ],
564 "install_kickstart_firewall_disabled": [ 568​ "install_kickstart_firewall_disabled": [
565 "QA:Testcase_kickstart_firewall_disabled", 569​ "QA:Testcase_kickstart_firewall_disabled",
566 ], 570​ ],
567 "install_kickstart_firewall_configured": [ 571​ "install_kickstart_firewall_configured": [
568 "QA:Testcase_kickstart_firewall_configured", 572​ "QA:Testcase_kickstart_firewall_configured",
Show All 13 Lines
View Options

scheduler/fedora_openqa_schedule/report.py

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Line(s)48def _uniqueres_replacements(job, uniqueres):
59 try: 59​ try:
60 (subvariant, imagetype, _) = flavor.split('-') 60​ (subvariant, imagetype, _) = flavor.split('-')
61 except ValueError: 61​ except ValueError:
62 # the above fails when the flavor is 'universal'. This is just 62​ # the above fails when the flavor is 'universal'. This is just
63 # to avoid crashing, these values should never be used 63​ # to avoid crashing, these values should never be used
64 subvariant = imagetype = 'universal' 64​ subvariant = imagetype = 'universal'
65 imagetype = imagetype.replace('boot', 'netinst') 65​ imagetype = imagetype.replace('boot', 'netinst')
66 subvariant = subvariant.replace('_Base', '') 66​ subvariant = subvariant.replace('_Base', '')
67​ subvariant_or_arm = "ARM" if arch == "arm" else subvariant
67 if 'UEFI' in job['settings']: 68​ if 'UEFI' in job['settings']:
68 uefi = 'UEFI' 69​ uefi = 'UEFI'
69 bootmethod = 'x86_64 UEFI' 70​ bootmethod = 'x86_64 UEFI'
70 else: 71​ else:
71 uefi = arch 72​ uefi = arch
72 bootmethod = 'x86_64 BIOS' 73​ bootmethod = 'x86_64 BIOS'
73 74​
74 changed = {} 75​ changed = {}
75 for key, value in uniqueres.iteritems(): 76​ for key, value in uniqueres.iteritems():
76 value = value.replace('$RUNARCH_OR_UEFI$', uefi) 77​ value = value.replace('$RUNARCH_OR_UEFI$', uefi)
77 value = value.replace('$FS$', fs) 78​ value = value.replace('$FS$', fs)
78 value = value.replace('$RUNARCH$', arch) 79​ value = value.replace('$RUNARCH$', arch)
79 value = value.replace('$BOOTMETHOD$', bootmethod) 80​ value = value.replace('$BOOTMETHOD$', bootmethod)
80 value = value.replace('$SUBVARIANT$', subvariant) 81​ value = value.replace('$SUBVARIANT$', subvariant)
81 value = value.replace('$IMAGETYPE$', imagetype) 82​ value = value.replace('$IMAGETYPE$', imagetype)
82 value = value.replace('$DESKTOP$', desktop) 83​ value = value.replace('$DESKTOP$', desktop)
84​ value = value.replace('$SUBVARIANT_OR_ARM$', subvariant_or_arm)
83 changed[key] = value 85​ changed[key] = value
84 86​
85 return changed 87​ return changed
86 88​
87 89​
88def get_passed_testcases(jobs): 90​def get_passed_testcases(jobs):
89 """Given an iterable of job dicts - any waiting, filtering and so 91​ """Given an iterable of job dicts - any waiting, filtering and so
90 on is assumed to have already happened - returns a list of 92​ on is assumed to have already happened - returns a list of
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines
View Options

scheduler/fedora_openqa_schedule/schedule.py

Show All 36 Lines
37 37​
38# Internal dependencies 38​# Internal dependencies
39from fedora_openqa_schedule.config import CONFIG, WANTED 39​from fedora_openqa_schedule.config import CONFIG, WANTED
40 40​
41logger = logging.getLogger(__name__) 41​logger = logging.getLogger(__name__)
42 42​
43FORMAT_TO_PARAM = { 43​FORMAT_TO_PARAM = {
44 "iso": "ISO_URL", 44​ "iso": "ISO_URL",
45 "raw.xz": "HDD_1_DECOMPRESS_URL" 45​ # let's connect it as second HDD - we can then use NUMDISKS=1 when we don't need it connected
46​ "raw.xz": "HDD_2_DECOMPRESS_URL"
adamwillUnsubmitted
Not Done

the word "it" is wrong here, I think. Do you mean "Let's connect it as second HDD"?

46} 47​}
47 48​
48 49​
49class TriggerException(Exception): 50​class TriggerException(Exception):
50 pass 51​ pass
51 52​
52 53​
53def _get_atomic_id(location): 54​def _get_atomic_id(location):
▲ Show 20 Lines • Show All 259 Lines • Show Last 20 Lines