Differential D754

Pungi 4 conversion: handle Pungi-derived BUILD and FLAVOR
ClosedPublic
Actions

Authored by adamwill on Feb 24 2016, 2:03 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTS476e4a328b31: better explanation of ISOURL and ISO in VARIABLES.md
rOPENQATESTSd3193be3f7e4: remember to shift when we use $self...
rOPENQATESTS35735f21cde8: Pungi 4 conversion: handle Pungi-derived BUILD and FLAVOR
rOPENQATESTS4b73585a74ed: pungi4: Atomic variant name is gonna be Atomic
rOPENQATESTS0d2f0cb58d26: we don't need $self here
rOPENQATESTS7e12eb4361c5: we don't actually need RAWHIDE var
rOPENQATESTSff0f5de643c7: dump get_release, just use VERSION
rOPENQATESTSc92ea1b9bd2a: install_source_graphical wasn't properly switched to VERSION
Summary

With the arrival of Pungi 4, the scheduler is no longer using
fedfind-provided BUILD and FLAVOR values, but ones derived from
Pungi properties. BUILD is now simply the Pungi compose_id.
FLAVOR is produced by joining the Pungi variant, type, and
format with '-' characters as the separators.

For the one place where we also used to parse the 'milestone'
from fedfind, there is a placeholder get_milestone subroutine
which currently returns an empty string, as I don't yet have a
good handle on how to draw the kinds of distinctions fedfind
mapped to 'milestone' from Pungi metadata.

Goes with D753 for openqa_fedora_tools.

Test Plan

As for D753. Make sure all tests actually behave as
intended.

Diff Detail

Repository
rOPENQATESTS os-autoinst-distri-fedora
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to Pungi 4 conversion: handle Pungi-derived BUILD and FLAVOR.Feb 24 2016, 2:03 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Feb 24 2016, 9:05 AM

LGTM.

VARIABLES.md
81–88

? for not forgetting changing those.

This revision is now accepted and ready to land.Feb 24 2016, 9:05 AM
jskladan accepted this revision.Feb 24 2016, 9:20 AM

Fine, I guess :)

adamwill added inline comments.Feb 24 2016, 4:04 PM
VARIABLES.md
81–88

YW, but we should actually probably move a lot of this upstream, since it's not particularly Fedora-specific, and have a shorter downstream doc specifying the Fedora conventions for relevant settings...

there are some other docs that I didn't update yet, I will send diffs for those later.

Closed by commit rOPENQATESTS35735f21cde8: Pungi 4 conversion: handle Pungi-derived BUILD and FLAVOR (authored by adamwill). · Explain WhyFeb 24 2016, 5:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1942

View Options

VARIABLES.md

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Line(s)
73| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition | 73​| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition |
74 74​
75Run variables 75​Run variables
76------------- 76​-------------
77These variables should be set when tests are scheduled (when running `isos post`). 77​These variables should be set when tests are scheduled (when running `isos post`).
78 78​
79| Variable | Explanation | 79​| Variable | Explanation |
80| -------- | ----------- | 80​| -------- | ----------- |
81| `ISO` | contains filename of ISO that is used for booting | 81​| `ISO` | contains filename of ISO that is used for booting, if ISO is already downloaded |
82​| `ISOURL` | contains URL for ISO to boot, openQA will download it. Set this or `ISO`, not both |
82| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) | 83​| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) |
83| `VERSION` | contains version of distribution | 84​| `VERSION` | contains version of distribution |
84| `FLAVOR` | indicates what type of distribution is used (`universal`, `generic_boot`, `workstation_live`, `server_boot`) | 85​| `FLAVOR` | indicates what type of distribution is used. Three Pungi properties, joined with `-`: `variant`, `type`, and `format`. e.g.: `Server-dvd-iso`. Special value `universal` is used to schedule the group of tests that should be run once each per arch per compose, against the 'best' available ISO |
85| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) | 86​| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) |
86| `BUILD` | contains string `vv_tt_bb`, where `vv` is fedora version number, `tt` is release name (`Beta`, `Final`, ...) and `bb` is build (`RC3`, ...) | 87​| `BUILD` | contains Pungi compose_id (something like `Fedora-24-20160121.n.3`) |
88​| `RAWHIDE` | set to 1 if this is a Rawhide compose (this is kind of a hack, see https://pagure.io/pungi/issue/134 ) |
garretrazielUnsubmitted
Not Done

? for not forgetting changing those.

adamwillAuthorUnsubmitted
Not Done

YW, but we should actually probably move a lot of this upstream, since it's not particularly Fedora-specific, and have a shorter downstream doc specifying the Fedora conventions for relevant settings...

there are some other docs that I didn't update yet, I will send diffs for those later.

View Options

lib/fedorabase.pm

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Line(s)78sub boot_to_login_screen {
83 83​
84 wait_still_screen $stillscreen, $timeout; 84​ wait_still_screen $stillscreen, $timeout;
85 85​
86 if ($boot_done_screen ne "") { 86​ if ($boot_done_screen ne "") {
87 assert_screen $boot_done_screen; 87​ assert_screen $boot_done_screen;
88 } 88​ }
89} 89​}
90 90​
91​sub get_release {
92​ my $self = shift;
93​ if (get_var("RAWHIDE")) {
94​ return 'rawhide';
95​ }
96​ else {
97​ return lc((split /-/, get_var("BUILD"))[1]);
98​ }
99​}
100​
101​sub get_milestone {
102​ my $self = shift;
103​ # FIXME: we don't know how to do this with Pungi 4 yet.
104​ return '';
105​}
106​
911; 107​1;
92 108​
93# vim: set sw=4 et: 109​# vim: set sw=4 et:
View Options

templates

1#!/usr/share/openqa/script/load_templates 1​#!/usr/share/openqa/script/load_templates
2# 2​#
3# openSUSE Machines, Products, TestSuites and JobTemplates 3​# openSUSE Machines, Products, TestSuites and JobTemplates
4# 4​#
5# use load_templates to load the file into the database 5​# use load_templates to load the file into the database
6# 6​#
7{ 7​{
8 JobTemplates => [ 8​ JobTemplates => [
9 { 9​ {
10 machine => { name => "64bit" }, 10​ machine => { name => "64bit" },
11 prio => 10, 11​ prio => 10,
12 product => { 12​ product => {
13 arch => "x86_64", 13​ arch => "x86_64",
14 distri => "fedora", 14​ distri => "fedora",
15 flavor => "workstation_live", 15​ flavor => "Workstation-live-iso",
16 version => "*", 16​ version => "*",
17 }, 17​ },
18 test_suite => { name => "default_install" }, 18​ test_suite => { name => "default_install" },
19 }, 19​ },
20 { 20​ {
21 machine => { name => "uefi" }, 21​ machine => { name => "uefi" },
22 prio => 11, 22​ prio => 11,
23 product => { 23​ product => {
24 arch => "x86_64", 24​ arch => "x86_64",
25 distri => "fedora", 25​ distri => "fedora",
26 flavor => "workstation_live", 26​ flavor => "Workstation-live-iso",
27 version => "*", 27​ version => "*",
28 }, 28​ },
29 test_suite => { name => "default_install" }, 29​ test_suite => { name => "default_install" },
30 }, 30​ },
31 { 31​ {
32 machine => { name => "64bit" }, 32​ machine => { name => "64bit" },
33 prio => 10, 33​ prio => 10,
34 product => { 34​ product => {
35 arch => "x86_64", 35​ arch => "x86_64",
36 distri => "fedora", 36​ distri => "fedora",
37 flavor => "server_boot", 37​ flavor => "Server-boot-iso",
38 version => "*", 38​ version => "*",
39 }, 39​ },
40 test_suite => { name => "default_install" }, 40​ test_suite => { name => "default_install" },
41 }, 41​ },
42 { 42​ {
43 machine => { name => "uefi" }, 43​ machine => { name => "uefi" },
44 prio => 11, 44​ prio => 11,
45 product => { 45​ product => {
46 arch => "x86_64", 46​ arch => "x86_64",
47 distri => "fedora", 47​ distri => "fedora",
48 flavor => "server_boot", 48​ flavor => "Server-boot-iso",
49 version => "*", 49​ version => "*",
50 }, 50​ },
51 test_suite => { name => "default_install" }, 51​ test_suite => { name => "default_install" },
52 }, 52​ },
53 { 53​ {
54 machine => { name => "64bit" }, 54​ machine => { name => "64bit" },
55 prio => 10, 55​ prio => 10,
56 product => { 56​ product => {
57 arch => "x86_64", 57​ arch => "x86_64",
58 distri => "fedora", 58​ distri => "fedora",
59 flavor => "server_dvd", 59​ flavor => "Server-dvd-iso",
60 version => "*", 60​ version => "*",
61 }, 61​ },
62 test_suite => { name => "default_install" }, 62​ test_suite => { name => "default_install" },
63 }, 63​ },
64 { 64​ {
65 machine => { name => "uefi" }, 65​ machine => { name => "uefi" },
66 prio => 11, 66​ prio => 11,
67 product => { 67​ product => {
68 arch => "x86_64", 68​ arch => "x86_64",
69 distri => "fedora", 69​ distri => "fedora",
70 flavor => "server_dvd", 70​ flavor => "Server-dvd-iso",
71 version => "*", 71​ version => "*",
72 }, 72​ },
73 test_suite => { name => "default_install" }, 73​ test_suite => { name => "default_install" },
74 }, 74​ },
75 { 75​ {
76 machine => { name => "64bit" }, 76​ machine => { name => "64bit" },
77 prio => 10, 77​ prio => 10,
78 product => { 78​ product => {
79 arch => "x86_64", 79​ arch => "x86_64",
80 distri => "fedora", 80​ distri => "fedora",
81 flavor => "generic_boot", 81​ flavor => "Everything-boot-iso",
82 version => "*", 82​ version => "*",
83 }, 83​ },
84 test_suite => { name => "default_install" }, 84​ test_suite => { name => "default_install" },
85 }, 85​ },
86 { 86​ {
87 machine => { name => "uefi" }, 87​ machine => { name => "uefi" },
88 prio => 11, 88​ prio => 11,
89 product => { 89​ product => {
90 arch => "x86_64", 90​ arch => "x86_64",
91 distri => "fedora", 91​ distri => "fedora",
92 flavor => "generic_boot", 92​ flavor => "Everything-boot-iso",
93 version => "*", 93​ version => "*",
94 }, 94​ },
95 test_suite => { name => "default_install" }, 95​ test_suite => { name => "default_install" },
96 }, 96​ },
97 { 97​ {
98 machine => { name => "64bit" }, 98​ machine => { name => "64bit" },
99 prio => 15, 99​ prio => 15,
100 product => { 100​ product => {
101 arch => "x86_64", 101​ arch => "x86_64",
102 distri => "fedora", 102​ distri => "fedora",
103 flavor => "workstation_boot", 103​ flavor => "Workstation-boot-iso",
104 version => "*", 104​ version => "*",
105 }, 105​ },
106 test_suite => { name => "default_install" }, 106​ test_suite => { name => "default_install" },
107 }, 107​ },
108 { 108​ {
109 machine => { name => "uefi" }, 109​ machine => { name => "uefi" },
110 prio => 16, 110​ prio => 16,
111 product => { 111​ product => {
112 arch => "x86_64", 112​ arch => "x86_64",
113 distri => "fedora", 113​ distri => "fedora",
114 flavor => "workstation_boot", 114​ flavor => "Workstation-boot-iso",
115 version => "*", 115​ version => "*",
116 }, 116​ },
117 test_suite => { name => "default_install" }, 117​ test_suite => { name => "default_install" },
118 }, 118​ },
119 { 119​ {
120 machine => { name => "64bit" }, 120​ machine => { name => "64bit" },
121 prio => 15, 121​ prio => 15,
122 product => { 122​ product => {
123 arch => "x86_64", 123​ arch => "x86_64",
124 distri => "fedora", 124​ distri => "fedora",
125 flavor => "kde_live", 125​ flavor => "KDE-live-iso",
126 version => "*", 126​ version => "*",
127 }, 127​ },
128 test_suite => { name => "default_install" }, 128​ test_suite => { name => "default_install" },
129 }, 129​ },
130 { 130​ {
131 machine => { name => "uefi" }, 131​ machine => { name => "uefi" },
132 prio => 16, 132​ prio => 16,
133 product => { 133​ product => {
134 arch => "x86_64", 134​ arch => "x86_64",
135 distri => "fedora", 135​ distri => "fedora",
136 flavor => "kde_live", 136​ flavor => "KDE-live-iso",
137 version => "*", 137​ version => "*",
138 }, 138​ },
139 test_suite => { name => "default_install" }, 139​ test_suite => { name => "default_install" },
140 }, 140​ },
141 { 141​ {
142 machine => { name => "64bit" }, 142​ machine => { name => "64bit" },
143 prio => 50, 143​ prio => 50,
144 product => { 144​ product => {
145 arch => "x86_64", 145​ arch => "x86_64",
146 distri => "fedora", 146​ distri => "fedora",
147 flavor => "cloud_atomic_canned", 147​ flavor => "Cloud_Atomic-boot-iso",
148 version => "*", 148​ version => "*",
149 }, 149​ },
150 test_suite => { name => "default_install" }, 150​ test_suite => { name => "default_install" },
151 }, 151​ },
152 { 152​ {
153 machine => { name => "64bit" }, 153​ machine => { name => "64bit" },
154 prio => 40, 154​ prio => 40,
155 product => { 155​ product => {
156 arch => "x86_64", 156​ arch => "x86_64",
157 distri => "fedora", 157​ distri => "fedora",
158 flavor => "generic_boot", 158​ flavor => "Everything-boot-iso",
159 version => "*", 159​ version => "*",
160 }, 160​ },
161 test_suite => { name => "base_selinux" }, 161​ test_suite => { name => "base_selinux" },
162 }, 162​ },
163 { 163​ {
164 machine => { name => "64bit" }, 164​ machine => { name => "64bit" },
165 prio => 40, 165​ prio => 40,
166 product => { 166​ product => {
167 arch => "x86_64", 167​ arch => "x86_64",
168 distri => "fedora", 168​ distri => "fedora",
169 flavor => "workstation_live", 169​ flavor => "Workstation-live-iso",
170 version => "*", 170​ version => "*",
171 }, 171​ },
172 test_suite => { name => "base_selinux" }, 172​ test_suite => { name => "base_selinux" },
173 }, 173​ },
174 { 174​ {
175 machine => { name => "64bit" }, 175​ machine => { name => "64bit" },
176 prio => 40, 176​ prio => 40,
177 product => { 177​ product => {
178 arch => "x86_64", 178​ arch => "x86_64",
179 distri => "fedora", 179​ distri => "fedora",
180 flavor => "server_dvd", 180​ flavor => "Server-dvd-iso",
181 version => "*", 181​ version => "*",
182 }, 182​ },
183 test_suite => { name => "base_selinux" }, 183​ test_suite => { name => "base_selinux" },
184 }, 184​ },
185 { 185​ {
186 machine => { name => "64bit" }, 186​ machine => { name => "64bit" },
187 prio => 42, 187​ prio => 42,
188 product => { 188​ product => {
189 arch => "x86_64", 189​ arch => "x86_64",
190 distri => "fedora", 190​ distri => "fedora",
191 flavor => "kde_live", 191​ flavor => "KDE-live-iso",
192 version => "*", 192​ version => "*",
193 }, 193​ },
194 test_suite => { name => "base_selinux" }, 194​ test_suite => { name => "base_selinux" },
195 }, 195​ },
196 { 196​ {
197 machine => { name => "64bit" }, 197​ machine => { name => "64bit" },
198 prio => 40, 198​ prio => 40,
199 product => { 199​ product => {
200 arch => "x86_64", 200​ arch => "x86_64",
201 distri => "fedora", 201​ distri => "fedora",
202 flavor => "generic_boot", 202​ flavor => "Everything-boot-iso",
203 version => "*", 203​ version => "*",
204 }, 204​ },
205 test_suite => { name => "base_services_start" }, 205​ test_suite => { name => "base_services_start" },
206 }, 206​ },
207 { 207​ {
208 machine => { name => "64bit" }, 208​ machine => { name => "64bit" },
209 prio => 40, 209​ prio => 40,
210 product => { 210​ product => {
211 arch => "x86_64", 211​ arch => "x86_64",
212 distri => "fedora", 212​ distri => "fedora",
213 flavor => "workstation_live", 213​ flavor => "Workstation-live-iso",
214 version => "*", 214​ version => "*",
215 }, 215​ },
216 test_suite => { name => "base_services_start" }, 216​ test_suite => { name => "base_services_start" },
217 }, 217​ },
218 { 218​ {
219 machine => { name => "64bit" }, 219​ machine => { name => "64bit" },
220 prio => 40, 220​ prio => 40,
221 product => { 221​ product => {
222 arch => "x86_64", 222​ arch => "x86_64",
223 distri => "fedora", 223​ distri => "fedora",
224 flavor => "server_dvd", 224​ flavor => "Server-dvd-iso",
225 version => "*", 225​ version => "*",
226 }, 226​ },
227 test_suite => { name => "base_services_start" }, 227​ test_suite => { name => "base_services_start" },
228 }, 228​ },
229 { 229​ {
230 machine => { name => "64bit" }, 230​ machine => { name => "64bit" },
231 prio => 42, 231​ prio => 42,
232 product => { 232​ product => {
233 arch => "x86_64", 233​ arch => "x86_64",
234 distri => "fedora", 234​ distri => "fedora",
235 flavor => "kde_live", 235​ flavor => "KDE-live-iso",
236 version => "*", 236​ version => "*",
237 }, 237​ },
238 test_suite => { name => "base_services_start" }, 238​ test_suite => { name => "base_services_start" },
239 }, 239​ },
240 { 240​ {
241 machine => { name => "64bit" }, 241​ machine => { name => "64bit" },
242 prio => 40, 242​ prio => 40,
243 product => { 243​ product => {
244 arch => "x86_64", 244​ arch => "x86_64",
245 distri => "fedora", 245​ distri => "fedora",
246 flavor => "generic_boot", 246​ flavor => "Everything-boot-iso",
247 version => "*", 247​ version => "*",
248 }, 248​ },
249 test_suite => { name => "base_service_manipulation" }, 249​ test_suite => { name => "base_service_manipulation" },
250 }, 250​ },
251 { 251​ {
252 machine => { name => "64bit" }, 252​ machine => { name => "64bit" },
253 prio => 40, 253​ prio => 40,
254 product => { 254​ product => {
255 arch => "x86_64", 255​ arch => "x86_64",
256 distri => "fedora", 256​ distri => "fedora",
257 flavor => "workstation_live", 257​ flavor => "Workstation-live-iso",
258 version => "*", 258​ version => "*",
259 }, 259​ },
260 test_suite => { name => "base_service_manipulation" }, 260​ test_suite => { name => "base_service_manipulation" },
261 }, 261​ },
262 { 262​ {
263 machine => { name => "64bit" }, 263​ machine => { name => "64bit" },
264 prio => 40, 264​ prio => 40,
265 product => { 265​ product => {
266 arch => "x86_64", 266​ arch => "x86_64",
267 distri => "fedora", 267​ distri => "fedora",
268 flavor => "server_dvd", 268​ flavor => "Server-dvd-iso",
269 version => "*", 269​ version => "*",
270 }, 270​ },
271 test_suite => { name => "base_service_manipulation" }, 271​ test_suite => { name => "base_service_manipulation" },
272 }, 272​ },
273 { 273​ {
274 machine => { name => "64bit" }, 274​ machine => { name => "64bit" },
275 prio => 42, 275​ prio => 42,
276 product => { 276​ product => {
277 arch => "x86_64", 277​ arch => "x86_64",
278 distri => "fedora", 278​ distri => "fedora",
279 flavor => "kde_live", 279​ flavor => "KDE-live-iso",
280 version => "*", 280​ version => "*",
281 }, 281​ },
282 test_suite => { name => "base_service_manipulation" }, 282​ test_suite => { name => "base_service_manipulation" },
283 }, 283​ },
284 { 284​ {
285 machine => { name => "64bit" }, 285​ machine => { name => "64bit" },
286 prio => 30, 286​ prio => 30,
287 product => { 287​ product => {
▲ Show 20 Lines • Show All 434 Lines • ▼ Show 20 Line(s)713 {
722 test_suite => { name => "european_language_install" }, 722​ test_suite => { name => "european_language_install" },
723 }, 723​ },
724 { 724​ {
725 machine => { name => "64bit" }, 725​ machine => { name => "64bit" },
726 prio => 11, 726​ prio => 11,
727 product => { 727​ product => {
728 arch => "i386", 728​ arch => "i386",
729 distri => "fedora", 729​ distri => "fedora",
730 flavor => "workstation_live", 730​ flavor => "Workstation-live-iso",
731 version => "*", 731​ version => "*",
732 }, 732​ },
733 test_suite => { name => "default_install" }, 733​ test_suite => { name => "default_install" },
734 }, 734​ },
735 { 735​ {
736 machine => { name => "64bit" }, 736​ machine => { name => "64bit" },
737 prio => 12, 737​ prio => 12,
738 product => { 738​ product => {
739 arch => "i386", 739​ arch => "i386",
740 distri => "fedora", 740​ distri => "fedora",
741 flavor => "server_boot", 741​ flavor => "Server-boot-iso",
742 version => "*", 742​ version => "*",
743 }, 743​ },
744 test_suite => { name => "default_install" }, 744​ test_suite => { name => "default_install" },
745 }, 745​ },
746 { 746​ {
747 machine => { name => "64bit" }, 747​ machine => { name => "64bit" },
748 prio => 12, 748​ prio => 12,
749 product => { 749​ product => {
750 arch => "i386", 750​ arch => "i386",
751 distri => "fedora", 751​ distri => "fedora",
752 flavor => "server_dvd", 752​ flavor => "Server-dvd-iso",
753 version => "*", 753​ version => "*",
754 }, 754​ },
755 test_suite => { name => "default_install" }, 755​ test_suite => { name => "default_install" },
756 }, 756​ },
757 { 757​ {
758 machine => { name => "64bit" }, 758​ machine => { name => "64bit" },
759 prio => 12, 759​ prio => 12,
760 product => { 760​ product => {
761 arch => "i386", 761​ arch => "i386",
762 distri => "fedora", 762​ distri => "fedora",
763 flavor => "generic_boot", 763​ flavor => "Everything-boot-iso",
764 version => "*", 764​ version => "*",
765 }, 765​ },
766 test_suite => { name => "default_install" }, 766​ test_suite => { name => "default_install" },
767 }, 767​ },
768 { 768​ {
769 machine => { name => "64bit" }, 769​ machine => { name => "64bit" },
770 prio => 17, 770​ prio => 17,
771 product => { 771​ product => {
772 arch => "i386", 772​ arch => "i386",
773 distri => "fedora", 773​ distri => "fedora",
774 flavor => "workstation_boot", 774​ flavor => "Workstation-boot-iso",
775 version => "*", 775​ version => "*",
776 }, 776​ },
777 test_suite => { name => "default_install" }, 777​ test_suite => { name => "default_install" },
778 }, 778​ },
779 { 779​ {
780 machine => { name => "64bit" }, 780​ machine => { name => "64bit" },
781 prio => 17, 781​ prio => 17,
782 product => { 782​ product => {
783 arch => "i386", 783​ arch => "i386",
784 distri => "fedora", 784​ distri => "fedora",
785 flavor => "kde_live", 785​ flavor => "KDE-live-iso",
786 version => "*", 786​ version => "*",
787 }, 787​ },
788 test_suite => { name => "default_install" }, 788​ test_suite => { name => "default_install" },
789 }, 789​ },
790 { 790​ {
791 machine => { name => "64bit" }, 791​ machine => { name => "64bit" },
792 prio => 32, 792​ prio => 32,
793 product => { 793​ product => {
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Line(s)938 {
942 name => "", 942​ name => "",
943 settings => [ 943​ settings => [
944 ], 944​ ],
945 version => "*", 945​ version => "*",
946 }, 946​ },
947 { 947​ {
948 arch => "x86_64", 948​ arch => "x86_64",
949 distri => "fedora", 949​ distri => "fedora",
950 flavor => "generic_boot", 950​ flavor => "Everything-boot-iso",
951 name => "", 951​ name => "",
952 settings => [ 952​ settings => [
953 ], 953​ ],
954 version => "*", 954​ version => "*",
955 }, 955​ },
956 { 956​ {
957 arch => "x86_64", 957​ arch => "x86_64",
958 distri => "fedora", 958​ distri => "fedora",
959 flavor => "server_boot", 959​ flavor => "Server-boot-iso",
960 name => "", 960​ name => "",
961 settings => [ 961​ settings => [
962 ], 962​ ],
963 version => "*", 963​ version => "*",
964 }, 964​ },
965 { 965​ {
966 arch => "x86_64", 966​ arch => "x86_64",
967 distri => "fedora", 967​ distri => "fedora",
968 flavor => "server_dvd", 968​ flavor => "Server-dvd-iso",
969 name => "", 969​ name => "",
970 settings => [ 970​ settings => [
971 ], 971​ ],
972 version => "*", 972​ version => "*",
973 }, 973​ },
974 { 974​ {
975 arch => "x86_64", 975​ arch => "x86_64",
976 distri => "fedora", 976​ distri => "fedora",
977 flavor => "cloud_atomic_canned", 977​ flavor => "Cloud_Atomic-boot-iso",
978 name => "", 978​ name => "",
979 settings => [ 979​ settings => [
980 { key => "CANNED", value => "1" } 980​ { key => "CANNED", value => "1" }
981 ], 981​ ],
982 version => "*", 982​ version => "*",
983 }, 983​ },
984 { 984​ {
985 arch => "x86_64", 985​ arch => "x86_64",
986 distri => "fedora", 986​ distri => "fedora",
987 flavor => "workstation_boot", 987​ flavor => "Workstation-boot-iso",
988 name => "", 988​ name => "",
989 settings => [ 989​ settings => [
990 { key => "DESKTOP", value => "gnome" } 990​ { key => "DESKTOP", value => "gnome" }
991 ], 991​ ],
992 version => "*", 992​ version => "*",
993 }, 993​ },
994 { 994​ {
995 arch => "x86_64", 995​ arch => "x86_64",
996 distri => "fedora", 996​ distri => "fedora",
997 flavor => "workstation_live", 997​ flavor => "Workstation-live-iso",
998 name => "", 998​ name => "",
999 settings => [ 999​ settings => [
1000 { key => "LIVE", value => "1" }, 1000​ { key => "LIVE", value => "1" },
1001 { key => "DESKTOP", value => "gnome" } 1001​ { key => "DESKTOP", value => "gnome" }
1002 ], 1002​ ],
1003 version => "*", 1003​ version => "*",
1004 }, 1004​ },
1005 { 1005​ {
1006 arch => "x86_64", 1006​ arch => "x86_64",
1007 distri => "fedora", 1007​ distri => "fedora",
1008 flavor => "kde_live", 1008​ flavor => "KDE-live-iso",
1009 name => "", 1009​ name => "",
1010 settings => [ 1010​ settings => [
1011 { key => "LIVE", value => "1" }, 1011​ { key => "LIVE", value => "1" },
1012 { key => "DESKTOP", value => "kde" } 1012​ { key => "DESKTOP", value => "kde" }
1013 ], 1013​ ],
1014 version => "*", 1014​ version => "*",
1015 }, 1015​ },
1016 { 1016​ {
1017 arch => "i386", 1017​ arch => "i386",
1018 distri => "fedora", 1018​ distri => "fedora",
1019 flavor => "universal", 1019​ flavor => "universal",
1020 name => "", 1020​ name => "",
1021 settings => [ 1021​ settings => [
1022 ], 1022​ ],
1023 version => "*", 1023​ version => "*",
1024 }, 1024​ },
1025 { 1025​ {
1026 arch => "i386", 1026​ arch => "i386",
1027 distri => "fedora", 1027​ distri => "fedora",
1028 flavor => "generic_boot", 1028​ flavor => "Everything-boot-iso",
1029 name => "", 1029​ name => "",
1030 settings => [ 1030​ settings => [
1031 ], 1031​ ],
1032 version => "*", 1032​ version => "*",
1033 }, 1033​ },
1034 { 1034​ {
1035 arch => "i386", 1035​ arch => "i386",
1036 distri => "fedora", 1036​ distri => "fedora",
1037 flavor => "server_boot", 1037​ flavor => "Server-boot-iso",
1038 name => "", 1038​ name => "",
1039 settings => [ 1039​ settings => [
1040 ], 1040​ ],
1041 version => "*", 1041​ version => "*",
1042 }, 1042​ },
1043 { 1043​ {
1044 arch => "i386", 1044​ arch => "i386",
1045 distri => "fedora", 1045​ distri => "fedora",
1046 flavor => "server_dvd", 1046​ flavor => "Server-dvd-iso",
1047 name => "", 1047​ name => "",
1048 settings => [ 1048​ settings => [
1049 ], 1049​ ],
1050 version => "*", 1050​ version => "*",
1051 }, 1051​ },
1052 { 1052​ {
1053 arch => "i386", 1053​ arch => "i386",
1054 distri => "fedora", 1054​ distri => "fedora",
1055 flavor => "workstation_boot", 1055​ flavor => "Workstation-boot-iso",
1056 name => "", 1056​ name => "",
1057 settings => [ 1057​ settings => [
1058 { key => "DESKTOP", value => "gnome" } 1058​ { key => "DESKTOP", value => "gnome" }
1059 ], 1059​ ],
1060 version => "*", 1060​ version => "*",
1061 }, 1061​ },
1062 { 1062​ {
1063 arch => "i386", 1063​ arch => "i386",
1064 distri => "fedora", 1064​ distri => "fedora",
1065 flavor => "workstation_live", 1065​ flavor => "Workstation-live-iso",
1066 name => "", 1066​ name => "",
1067 settings => [ 1067​ settings => [
1068 { key => "LIVE", value => "1" }, 1068​ { key => "LIVE", value => "1" },
1069 { key => "DESKTOP", value => "gnome" } 1069​ { key => "DESKTOP", value => "gnome" }
1070 ], 1070​ ],
1071 version => "*", 1071​ version => "*",
1072 }, 1072​ },
1073 { 1073​ {
1074 arch => "i386", 1074​ arch => "i386",
1075 distri => "fedora", 1075​ distri => "fedora",
1076 flavor => "kde_live", 1076​ flavor => "KDE-live-iso",
1077 name => "", 1077​ name => "",
1078 settings => [ 1078​ settings => [
1079 { key => "LIVE", value => "1" }, 1079​ { key => "LIVE", value => "1" },
1080 { key => "DESKTOP", value => "kde" } 1080​ { key => "DESKTOP", value => "kde" }
1081 ], 1081​ ],
1082 version => "*", 1082​ version => "*",
1083 } 1083​ }
1084 ], 1084​ ],
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines
View Options

tests/_boot_to_anaconda.pm

Show All 33 Lines17sub run {
34 34​
35 } 35​ }
36 36​
37 # 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
38 if (get_var("REPOSITORY_VARIATION")){ 38​ if (get_var("REPOSITORY_VARIATION")){
39 unless (get_var("GRUB")){ 39​ unless (get_var("GRUB")){
40 get_kernel_line; 40​ get_kernel_line;
41 } 41​ }
42 my $fedora_version = ""; ​
43 my $repourl = ""; 42​ my $repourl = "";
44 43​
45 $fedora_version = lc((split /_/, get_var("BUILD"))[0]); ​
46 ​
47 # REPOSITORY_VARIATION should be set to repository URL without version and architecture 44​ # REPOSITORY_VARIATION should be set to repository URL without version and architecture
48 # appended (it will be appended automatically) 45​ # appended (it will be appended automatically)
49 $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; 46​ $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
50 type_string " inst.repo=".$repourl; 47​ type_string " inst.repo=".$repourl;
51 } 48​ }
52 49​
53 # now we are on the correct "boot" menu item 50​ # now we are on the correct "boot" menu item
54 # hit Ctrl+x for the case when the uefi kernel line was edited 51​ # hit Ctrl+x for the case when the uefi kernel line was edited
55 send_key "ctrl-x"; 52​ send_key "ctrl-x";
56 # Return starts boot in all other cases 53​ # Return starts boot in all other cases
57 send_key "ret"; 54​ send_key "ret";
Show All 40 Lines
View Options

tests/install_source_graphical.pm

Show All 15 Lines5sub run {
16 for (my $i=0; $i<4; $i++){ 16​ for (my $i=0; $i<4; $i++){
17 send_key "up"; 17​ send_key "up";
18 } 18​ }
19 assert_screen "anaconda_install_source_http_selected"; 19​ assert_screen "anaconda_install_source_http_selected";
20 20​
21 21​
22 # insert the url 22​ # insert the url
23 send_key "tab"; 23​ send_key "tab";
24 my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); ​
25 my $repourl = ""; 24​ my $repourl = "";
26 if ($fedora_version ne "rawhide"){ 25​ my $fedora_release = $self->get_release;
27 if (get_var("MIRRORLIST_GRAPHICAL")){ ​
28 $fedora_version = "fedora-".$fedora_version; ​
29 } ​
30 } ​
31 26​
32 # if either MIRRORLIST_GRAPHICAL or REPOSITORY_GRAPHICAL is set, type this into 27​ # if either MIRRORLIST_GRAPHICAL or REPOSITORY_GRAPHICAL is set, type this into
33 # the repository url input 28​ # the repository url input
34 if (get_var("MIRRORLIST_GRAPHICAL")){ 29​ if (get_var("MIRRORLIST_GRAPHICAL")){
35 $repourl = "mirrors.fedoraproject.org/mirrorlist?repo=".$fedora_version."&arch=".get_var('ARCH'); 30​ $repourl = "mirrors.fedoraproject.org/mirrorlist?repo=".$fedora_release."&arch=".get_var('ARCH');
36 type_string $repourl; 31​ type_string $repourl;
37 32​
38 # select as mirror list 33​ # select as mirror list
39 assert_and_click "anaconda_install_source_repo_select_mirrorlist"; 34​ assert_and_click "anaconda_install_source_repo_select_mirrorlist";
40 } 35​ }
41 elsif (get_var("REPOSITORY_GRAPHICAL")){ 36​ elsif (get_var("REPOSITORY_GRAPHICAL")){
42 $repourl = get_var("REPOSITORY_GRAPHICAL")."/".$fedora_version."/".get_var("ARCH")."/os"; 37​ $repourl = get_var("REPOSITORY_GRAPHICAL")."/".$fedora_release."/".get_var("ARCH")."/os";
43 type_string $repourl; 38​ type_string $repourl;
44 } 39​ }
45 40​
46 assert_and_click "anaconda_spoke_done"; 41​ assert_and_click "anaconda_spoke_done";
47 42​
48 # Anaconda hub 43​ # Anaconda hub
49 assert_screen "anaconda_main_hub", 300; 44​ assert_screen "anaconda_main_hub", 300;
50 45​
Show All 21 Lines
View Options

tests/install_source_variation.pm

1use base "anacondatest"; 1​use base "anacondatest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5sub run { 5​sub run {
6 # !!! GRUB parameter is set in _boot_to_anaconda.pm !!! 6​ # !!! GRUB parameter is set in _boot_to_anaconda.pm !!!
7 my $self = shift; 7​ my $self = shift;
8 # Anaconda hub 8​ # Anaconda hub
9 assert_screen "anaconda_main_hub"; 9​ assert_screen "anaconda_main_hub";
10 10​
11 # FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate ​
12 my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); ​
13 my $repourl = ""; 11​ my $repourl = "";
14 12​
15 $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; 13​ $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
16 14​
17 # check that the repo was used 15​ # check that the repo was used
18 $self->root_console; 16​ $self->root_console;
19 validate_script_output "grep \"".$repourl."\" /tmp/packaging.log", sub { $_ =~ m/added repo: 'anaconda'/ }; 17​ validate_script_output "grep \"".$repourl."\" /tmp/packaging.log", sub { $_ =~ m/added repo: 'anaconda'/ };
20 send_key "ctrl-alt-f6"; 18​ send_key "ctrl-alt-f6";
21 19​
22 # Anaconda hub 20​ # Anaconda hub
23 assert_screen "anaconda_main_hub", 30; # 21​ assert_screen "anaconda_main_hub", 30; #
Show All 14 Lines
View Options

tests/upgrade_run.pm

1use base "installedtest"; 1​use base "installedtest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5sub run { 5​sub run {
6 my $release = lc(get_var('VERSION')); 6​ my $release = $self->get_release;
7 my $milestone = lc((split /_/, get_var("BUILD"))[1]); 7​ # NOTE: this doesn't actually work yet, it's a FIXME in fedorabase
8​ my $milestone = $self->get_milestone;
8 my $args = "--releasever=${release}"; 9​ my $args = "--releasever=${release}";
9 # This is excessive - after the Bodhi activation point we don't 10​ # This is excessive - after the Bodhi activation point we don't
10 # need --nogpgcheck for Branched. But that's hard to detect magically 11​ # need --nogpgcheck for Branched. But that's hard to detect magically
11 if ($release eq 'rawhide' or $milestone eq 'branched') { 12​ if ($release eq 'rawhide' or $milestone eq 'branched') {
12 $args .= " --nogpgcheck"; 13​ $args .= " --nogpgcheck";
13 } 14​ }
14 # disable screen blanking (download can take a long time) 15​ # disable screen blanking (download can take a long time)
15 script_run "setterm -blank 0"; 16​ script_run "setterm -blank 0";
Show All 34 Lines