Differential D973

enable ENTRYPOINT to be more than one test, ensure shutdown when on ARM
ClosedPublic
Actions

Authored by garretraziel on Aug 15 2016, 11:23 AM.

Details

Reviewers
adamwill
Maniphest Tasks
T830: Shut down VM before uploading disk image (ARM)
Commits
rOPENQATESTS0728e09c757e: enable ENTRYPOINT to be more than one test, ensure shutdown when on ARM
Summary

This adds possiblity to specify more than one test in ENTRYPOINT
variable - test names should be separated with spaces and loading is done
as with POSTINSTALL.

Add _console_shutdown test to ARM image deployment.

Test Plan

run install_arm_image_deployment_upload, followed by base_services_start_arm
and ensure that disk was created in the first test and second test run without problem.

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.
garretraziel retitled this revision from to enable ENTRYPOINT to be more than one test, ensure shutdown when on ARM.Aug 15 2016, 11:23 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added a reviewer: adamwill.
garretraziel added a comment.Aug 15 2016, 11:31 AM

So I've chosen to enable ENTRYPOINT to have more than one test specified to solve this issue, rather than reorganizing main. Reasoning is that our ARM tests really aren't "installation" tests per se, so it wouldn't make sense to let them go through "installation" and "postinstallation" phases. We could separate "ensure shut down" phase to be run outside "postinstallation", but there are tests for which we don't need to ensure shutting down so I've simply added _console_shutdown test to be run after install_arm_image_deployment. I've tested it and both ARM tests should run (but they've passed on my computer even before).

adamwill accepted this revision.Aug 15 2016, 11:59 PM

"I've tested it and both ARM tests should run (but they've passed on my computer even before)."

Yeah, this has changed a bit with the recent big changes to VM shutdown upstream, I think. I think that before those changes, even if we didn't shut down the VM as part of the test, it got auto-killed somehow before the disk upload stage. Now it doesn't, and that check is hit.

I recall that we didn't shut down the system in the upload tests at first, and they didn't hit this error at that time. So I'm pretty sure it's down to the recent upstream changes. If you're running an older os-autoinst locally, it's definitely plausible that it wouldn't hit the error.

The diff looks good, thanks. If we start getting lots more ARM tests it would maybe make sense to do this with main.pm logic - maybe we just rebrand postinstall to something a bit more generic - but for now this is fine.

This revision is now accepted and ready to land.Aug 15 2016, 11:59 PM
Closed by commit rOPENQATESTS0728e09c757e: enable ENTRYPOINT to be more than one test, ensure shutdown when on ARM (authored by garretraziel). · Explain WhyAug 16 2016, 7:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
MVARIABLES.md (2 lines)
Mmain.pm (6 lines)
Mtemplates (3 lines)

Diff 2492

View Options

VARIABLES.md

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)
51There are certain tests that conflict each other. Note that conflict is always mutual, but for simplification 51​There are certain tests that conflict each other. Note that conflict is always mutual, but for simplification
52purposes, only one side of this conflict is shown (that means, if it's shown that `A` conflicts `B`, 52​purposes, only one side of this conflict is shown (that means, if it's shown that `A` conflicts `B`,
53it also means that `B` conflicts `A` even if not shown in the table). 53​it also means that `B` conflicts `A` even if not shown in the table).
54 54​
55| Variable | Values allowed | Default value/behavior | Conflicts | Explanation | 55​| Variable | Values allowed | Default value/behavior | Conflicts | Explanation |
56| -------- | :------------: | ---------------------- | :-------: | ----------- | 56​| -------- | :------------: | ---------------------- | :-------: | ----------- |
57| `LIVE` | boolean | not set | technically `PACKAGE_SET`, `KICKSTART`, `MIRRORLIST_GRAPHICAL`, `REPOSITORY_GRAPHICAL`, `REPOSITORY_VARIATION` | specify that the test is running on Live system - additional steps are required (starting Anaconda...) | 57​| `LIVE` | boolean | not set | technically `PACKAGE_SET`, `KICKSTART`, `MIRRORLIST_GRAPHICAL`, `REPOSITORY_GRAPHICAL`, `REPOSITORY_VARIATION` | specify that the test is running on Live system - additional steps are required (starting Anaconda...) |
58| `PACKAGE_SET` | string (`minimal`, `default`, ...) | `minimal`; `default` when `LIVE` is set | nothing | sets packageset to install - you have to add appropriate needles, see `tests/_software_selection.pm` | 58​| `PACKAGE_SET` | string (`minimal`, `default`, ...) | `minimal`; `default` when `LIVE` is set | nothing | sets packageset to install - you have to add appropriate needles, see `tests/_software_selection.pm` |
59| `ENTRYPOINT` | filename | not set | N/A | set `ENTRYPOINT` to load specific test directly (bypass modular structure, mainly usable for testing) | 59​| `ENTRYPOINT` | filename | not set | N/A | set `ENTRYPOINT` to load specific test directly (bypass modular structure, mainly usable for testing). If you want to run more than one test, separate them with space. |
60| `UPGRADE` | string (`minimal`, `desktop`, `encrypted`, ...) | not set | all except of `LIVE` and `USER_PASSWORD` | when set, do an upgrade test of specified type | 60​| `UPGRADE` | string (`minimal`, `desktop`, `encrypted`, ...) | not set | all except of `LIVE` and `USER_PASSWORD` | when set, do an upgrade test of specified type |
61| `KICKSTART` | boolean | `false`/not set | all | when specified, do an kickstart installation (you should use `GRUB` variable to specify where kickstart file resides) | 61​| `KICKSTART` | boolean | `false`/not set | all | when specified, do an kickstart installation (you should use `GRUB` variable to specify where kickstart file resides) |
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) |
Show All 22 Lines
View Options

main.pm

Show First 20 Lines • Show All 211 Lines • ▼ Show 20 Line(s)169sub load_postinstall_tests() {
212 } 212​ }
213} 213​}
214 214​
215## LOADING STARTS HERE 215​## LOADING STARTS HERE
216 216​
217 217​
218# if user set ENTRYPOINT, run required test directly 218​# if user set ENTRYPOINT, run required test directly
219# (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.) 219​# (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.)
220​# if you want to run more than one test via ENTRYPOINT, separate them with space
220if (get_var("ENTRYPOINT")) { 221​if (get_var("ENTRYPOINT")) {
221 autotest::loadtest "tests/".get_var("ENTRYPOINT").".pm"; 222​ my @entrs = split(/ /, get_var("ENTRYPOINT"));
223​ foreach my $entr (@entrs) {
224​ autotest::loadtest "tests/${entr}.pm";
225​ }
222} 226​}
223elsif (get_var("UPGRADE")) { 227​elsif (get_var("UPGRADE")) {
224 load_upgrade_tests; 228​ load_upgrade_tests;
225} 229​}
226elsif (!get_var("BOOTFROM")) { 230​elsif (!get_var("BOOTFROM")) {
227 # for now we can assume BOOTFROM means this test picks up 231​ # for now we can assume BOOTFROM means this test picks up
228 # after an install, so we skip to post-install 232​ # after an install, so we skip to post-install
229 load_install_tests; 233​ load_install_tests;
Show All 9 Lines
View Options

templates

Show First 20 Lines • Show All 1415 Lines • ▼ Show 20 Line(s)1414 {
1416 settings => [ 1416​ settings => [
1417 { key => "PACKAGE_SET", value => "default" }, 1417​ { key => "PACKAGE_SET", value => "default" },
1418 { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, 1418​ { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
1419 ], 1419​ ],
1420 }, 1420​ },
1421 { 1421​ {
1422 name => "install_arm_image_deployment_upload", 1422​ name => "install_arm_image_deployment_upload",
1423 settings => [ 1423​ settings => [
1424 { key => "ENTRYPOINT", value => "install_arm_image_deployment" }, 1424​ # run ARM entrypoint and also make sure that VM shuts down correctly
1425​ { key => "ENTRYPOINT", value => "install_arm_image_deployment _console_shutdown" },
1425 # we don't want HDD_2 to be really connected, but we need to use it to download 1426​ # we don't want HDD_2 to be really connected, but we need to use it to download
1426 # HDD ISO, see https://github.com/os-autoinst/openQA/issues/684 1427​ # HDD ISO, see https://github.com/os-autoinst/openQA/issues/684
1427 { key => "NUMDISKS", value => "1" }, 1428​ { key => "NUMDISKS", value => "1" },
1428 { key => "HDD_1", value => "%HDD_2%" }, 1429​ { key => "HDD_1", value => "%HDD_2%" },
1429 { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, 1430​ { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
1430 ], 1431​ ],
1431 }, 1432​ },
1432 { 1433​ {
▲ Show 20 Lines • Show All 561 Lines • Show Last 20 Lines