Differential D801

rename BOOT_UPDATES_IMG_URL to TEST_UPDATES, add GRUBADD
ClosedPublic
Actions

Authored by adamwill on Apr 1 2016, 12:19 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTSdf195a78535a: rename BOOT_UPDATES_IMG_URL to TEST_UPDATES, add GRUBADD
Summary

BOOT_UPDATES_IMG_URL is a pretty misleading name - it used to
be the actual URL, but now it's simply a boolean that decides
whether we look for the effect of the openQA updates image or
not. TEST_UPDATES seems clearer.

GRUBADD does the same thing as GRUB, on top of it. The point of
this is so we can add an option to the scheduler CLI that lets
you say 'run the normal tests, but with this updates image' -
so we can easily (albeit manually triggered) check the impact
of some anaconda change that needs testing. It should never be
set in the templates or the tests, it's there strictly for the
scheduler (whether that's fedora_openqa_schedule or literally a
person calling client isos post) to use as a kind of override.
The tests that test updates image loading will probably fail
when doing this, but all other tests should work as intended,
including ones that specify GRUB, becase the extra params will
just get added on top. That's why I invented a new var instead
of just letting the scheduler override GRUB's value when POST
ing.

Test Plan

Check the rename didn't break anything (updates tests
still work). Run tests with GRUBADD param, make sure value is
correctly appended to cmdline both when GRUB is also specified
and when it is not.

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 rename BOOT_UPDATES_IMG_URL to TEST_UPDATES, add GRUBADD.Apr 1 2016, 12:19 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Apr 1 2016, 12:33 PM

Sure, looks good.

This revision is now accepted and ready to land.Apr 1 2016, 12:33 PM
adamwill added a comment.Apr 1 2016, 2:56 PM

This goes with D802, can you check that too? Thanks!

adamwill added a comment.Apr 1 2016, 2:59 PM

And now I read it, I see a bug...tum ti tum. Update coming.

adamwill updated this revision to Diff 2050.Apr 1 2016, 3:07 PM

do GRUBADD after REPOSITORY_VARIATION, check for both

REPOSITORY_VARIATION also gets glued into the kernel line, so do
GRUBADD after that and check for both before deciding whether to
do get_kernel_line. Perhaps we're at the point where this
would be cleaner with a little private subroutine that produces
a single chunk of text from all three vars and returns it, and
the main flow just adds that string if it's not empty? Meh.

Closed by commit rOPENQATESTSdf195a78535a: rename BOOT_UPDATES_IMG_URL to TEST_UPDATES, add GRUBADD (authored by adamwill). · Explain WhyApr 8 2016, 8:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
MVARIABLES.md (3 lines)
Mtemplates (4 lines)
Mtests/_boot_to_anaconda.pm (11 lines)
Mtests/disk_guided_empty.pm (2 lines)

Diff 2062

View Options

VARIABLES.md

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s)
62| `MIRRORLIST_GRAPHICAL` | boolean | `false`/not set | `REPOSITORY_GRAPHICAL` | sets installation source to mirrorlist | 62​| `MIRRORLIST_GRAPHICAL` | boolean | `false`/not set | `REPOSITORY_GRAPHICAL` | sets installation source to mirrorlist |
63| `REPOSITORY_GRAPHICAL` | url to repository (without arch and `/os`, for example `http://dl.fedoraproject.org/pub/fedora/linux/development`) | not set | `MIRRORLIST_GRAPHICAL` | sets installation source to repository url in Anaconda | 63​| `REPOSITORY_GRAPHICAL` | url to repository (without arch and `/os`, for example `http://dl.fedoraproject.org/pub/fedora/linux/development`) | not set | `MIRRORLIST_GRAPHICAL` | sets installation source to repository url in Anaconda |
64| `REPOSITORY_VARIATION` | url to repository (without arch and `/os`, for example `http://dl.fedoraproject.org/pub/fedora/linux/development`) | not set | nothing | sets installation source to repository url in GRUB | 64​| `REPOSITORY_VARIATION` | url to repository (without arch and `/os`, for example `http://dl.fedoraproject.org/pub/fedora/linux/development`) | not set | nothing | sets installation source to repository url in GRUB |
65| `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​| `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 |
66| `ENCRYPT_PASSWORD` | string | not set | nothing | if set, encrypt disk with given password | 66​| `ENCRYPT_PASSWORD` | string | not set | nothing | if set, encrypt disk with given password |
67| `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​| `DESKTOP` | boolean | `false`/not set | nothing | set to indicate that Fedora is running with GUI (so for example OpenQA should expect graphical login screen) |
68| `ROOT_PASSWORD` | string | `weakpassword` | nothing | root password is set to this value | 68​| `ROOT_PASSWORD` | string | `weakpassword` | nothing | root password is set to this value |
69| `GRUB` | string | not set | nothing | when set, append this string to kernel line in GRUB | 69​| `GRUB` | string | not set | nothing | when set, append this string to kernel line in GRUB |
70​| `GRUBADD` | string | not set | nothing | when set, append this string to kernel line in GRUB, after the `GRUB` string if that one is set too. This is never set by tests; instead it's provided as a way to e.g. run the normal tests with an `updates.img` to test some anaconda change (the scheduler CLI can help you use this feature) |
70| `USER_LOGIN` | string | not set | should be used with `USER_PASSWORD` (unless `false`) | when set, user login is set to this value. If not set, default value `test` is used for console installs, no login is done for graphical installs. If set to `false`, no user login will be done | 71​| `USER_LOGIN` | string | not set | should be used with `USER_PASSWORD` (unless `false`) | when set, user login is set to this value. If not set, default value `test` is used for console installs, no login is done for graphical installs. If set to `false`, no user login will be done |
71| `USER_PASSWORD` | string | not set | should be used with `USER_LOGIN` | when set, user password is set to this value. If not set, default value `weakpassword` is used for console installs, no login is done for graphical installs | 72​| `USER_PASSWORD` | string | not set | should be used with `USER_LOGIN` | when set, user password is set to this value. If not set, default value `weakpassword` is used for console installs, no login is done for graphical installs |
72| `BOOT_UPDATES_IMG_URL` | boolean | `false`/not set | set to indicate that path to updates.img was appended to kernel line | 73​| `TEST_UPDATES` | boolean | `false`/not set | set to indicate that this test checks updates.img loading, so we should check for the expected effect of the updates image used for this testing |
73| `POSTINSTALL` | string | not set | nothing | If set, `tests/(value)_postinstall.pm` will be loaded after install, boot, login, and other postinstall tests 74​| `POSTINSTALL` | string | not set | nothing | If set, `tests/(value)_postinstall.pm` will be loaded after install, boot, login, and other postinstall tests
74| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition | 75​| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition |
75 76​
76Run variables 77​Run variables
77------------- 78​-------------
78These variables should be set when tests are scheduled (when running `isos post`). 79​These variables should be set when tests are scheduled (when running `isos post`).
79 80​
80| Variable | Explanation | 81​| Variable | Explanation |
81| -------- | ----------- | 82​| -------- | ----------- |
82| `ISO` | contains filename of ISO that is used for booting. If ISOURL is not set, file must exist in /var/lib/openqa/share/factory/iso. If ISOURL is set, it will be downloaded to this name instead of its original name | 83​| `ISO` | contains filename of ISO that is used for booting. If ISOURL is not set, file must exist in /var/lib/openqa/share/factory/iso. If ISOURL is set, it will be downloaded to this name instead of its original name |
83| `ISO_URL` | contains URL for ISO to boot, openQA will download it | 84​| `ISO_URL` | contains URL for ISO to boot, openQA will download it |
84| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) | 85​| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) |
85| `VERSION` | contains version of distribution | 86​| `VERSION` | contains version of distribution |
86| `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 | 87​| `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 |
87| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) | 88​| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) |
88| `BUILD` | contains Pungi compose_id (something like `Fedora-24-20160121.n.3`) | 89​| `BUILD` | contains Pungi compose_id (something like `Fedora-24-20160121.n.3`) |
View Options

templates

Show First 20 Lines • Show All 1097 Lines • ▼ Show 20 Line(s)1096 settings => [
1098 { key => "NUMDISKS", value => "2" }, 1098​ { key => "NUMDISKS", value => "2" },
1099 { key => "HDD_2", value => "disk_full_mbr.img" }, 1099​ { key => "HDD_2", value => "disk_full_mbr.img" },
1100 { key => "ROOT_PASSWORD", value => "weakpassword" }, 1100​ { key => "ROOT_PASSWORD", value => "weakpassword" },
1101 ], 1101​ ],
1102 }, 1102​ },
1103 { 1103​ {
1104 name => "install_scsi_updates_img", 1104​ name => "install_scsi_updates_img",
1105 settings => [ 1105​ settings => [
1106 { key => "BOOT_UPDATES_IMG_URL", value => "1" }, 1106​ { key => "TEST_UPDATES", value => "1" },
1107 { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img" }, 1107​ { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img" },
1108 { key => "HDDMODEL", value => "virtio-scsi-pci" }, 1108​ { key => "HDDMODEL", value => "virtio-scsi-pci" },
1109 { key => "CDMODEL", value => "scsi-cd" }, 1109​ { key => "CDMODEL", value => "scsi-cd" },
1110 ], 1110​ ],
1111 }, 1111​ },
1112 { 1112​ {
1113 name => "install_kickstart_user_creation", 1113​ name => "install_kickstart_user_creation",
1114 settings => [ 1114​ settings => [
▲ Show 20 Lines • Show All 166 Lines • ▼ Show 20 Line(s)1276 settings => [
1281 { key => "DESKTOP", value => "gnome" }, 1281​ { key => "DESKTOP", value => "gnome" },
1282 ], 1282​ ],
1283 }, 1283​ },
1284 { 1284​ {
1285 name => "install_updates_img_local", 1285​ name => "install_updates_img_local",
1286 settings => [ 1286​ settings => [
1287 { key => "NUMDISKS", value => "2" }, 1287​ { key => "NUMDISKS", value => "2" },
1288 { key => "HDD_2", value => "disk_updates_img_2.img" }, 1288​ { key => "HDD_2", value => "disk_updates_img_2.img" },
1289 { key => "BOOT_UPDATES_IMG_URL", value => "1" }, 1289​ { key => "TEST_UPDATES", value => "1" },
1290 { key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" }, 1290​ { key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" },
1291 ], 1291​ ],
1292 }, 1292​ },
1293 { 1293​ {
1294 name => "install_shrink_ext4", 1294​ name => "install_shrink_ext4",
1295 settings => [ 1295​ settings => [
1296 { key => "ROOT_PASSWORD", value => "weakpassword" }, 1296​ { key => "ROOT_PASSWORD", value => "weakpassword" },
1297 { key => "HDD_1", value => "disk_shrink_ext4_mbr.img" }, 1297​ { key => "HDD_1", value => "disk_shrink_ext4_mbr.img" },
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines
View Options

tests/_boot_to_anaconda.pm

Show All 28 Lines17sub run {
29 29​
30 # 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
31 if( get_var("GRUB")){ 31​ if( get_var("GRUB")){
32 get_kernel_line; 32​ get_kernel_line;
33 type_string " ".get_var("GRUB"); 33​ type_string " ".get_var("GRUB");
34 34​
35 } 35​ }
36 36​
37​ # if GRUBADD is set, add that to kernel line too. this is for doing
38​ # stuff like running the tests with an updates.img to test some
39​ # anaconda change
40​ if (get_var("GRUBADD")) {
41​ # unless GRUB was also set, we need to get to the kernel line now
42​ get_kernel_line unless (get_var("GRUB"));
43​ type_string " ".get_var("GRUBADD");
44​ }
45​
37 # if variable REPOSITORY_VARIATION is set, construct inst.repo url and add it to kernel line 46​ # if variable REPOSITORY_VARIATION is set, construct inst.repo url and add it to kernel line
38 if (get_var("REPOSITORY_VARIATION")){ 47​ if (get_var("REPOSITORY_VARIATION")){
39 unless (get_var("GRUB")){ 48​ unless (get_var("GRUB") || get_var("GRUBADD")) {
40 get_kernel_line; 49​ get_kernel_line;
41 } 50​ }
42 my $repourl = ""; 51​ my $repourl = "";
43 52​
44 # REPOSITORY_VARIATION should be set to repository URL without version and architecture 53​ # REPOSITORY_VARIATION should be set to repository URL without version and architecture
45 # appended (it will be appended automatically) 54​ # appended (it will be appended automatically)
46 $repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/Everything/".get_var("ARCH")."/os"; 55​ $repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/Everything/".get_var("ARCH")."/os";
47 type_string " inst.repo=".$repourl; 56​ type_string " inst.repo=".$repourl;
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines
View Options

tests/disk_guided_empty.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 my $self = shift; 6​ my $self = shift;
7 # Anaconda hub 7​ # Anaconda hub
8 # Go to INSTALLATION DESTINATION and ensure one disk is selected. 8​ # Go to INSTALLATION DESTINATION and ensure one disk is selected.
9 $self->select_disks(); 9​ $self->select_disks();
10 10​
11 # updates.img tests work by changing the appearance of the INSTALLATION 11​ # updates.img tests work by changing the appearance of the INSTALLATION
12 # DESTINATION screen, so check that if needed. 12​ # DESTINATION screen, so check that if needed.
13 if (get_var('BOOT_UPDATES_IMG_URL')){ 13​ if (get_var('TEST_UPDATES')){
14 assert_screen "anaconda_install_destination_updates", 30; 14​ assert_screen "anaconda_install_destination_updates", 30;
15 } 15​ }
16 16​
17 assert_and_click "anaconda_spoke_done"; 17​ assert_and_click "anaconda_spoke_done";
18 18​
19 # Anaconda hub 19​ # Anaconda hub
20 assert_screen "anaconda_main_hub", 300; # 20​ assert_screen "anaconda_main_hub", 300; #
21 21​
Show All 13 Lines