Differential D567

convert upgrade tests to dnf-plugin-system-upgrade
ClosedPublic
Actions

Authored by adamwill on Sep 9 2015, 7:47 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTS68acecb6d480: convert upgrade tests to dnf-plugin-system-upgrade
Summary

This is a first cut which more or less works for now. Issues:

  1. We're not really testing the BUILD, here. All the test does

is try and upgrade to the specified VERSION - so it'll be using
the latest 'stable' for the given VERSION at the time the test
runs. This isn't really that terrible, but especially for TC/RC
validation, we might want to make things a bit more elaborate
and set up the repo for the actual BUILD (and disable the main
repos).

  1. We'd actually need --nogpgcheck for non-Rawhide, at one

specific point in the release cycle - after Branching but
before Bodhi activation (which is when we can be sure all
packages are signed). This won't matter until 24 branches, and
maybe releng will have it fixed by then...if not, I'll tweak
it.

  1. We don't really test that the upgrade actually *happened*

for desktop, at the moment - the only thing in the old test
that really checked that was where we checked for the fedup
boot menu entry, but that has no analog in dnf. What we should
probably do is check that GUI login works, then switch to a
console and check /etc/fedora-release just as the minimal test
does.

Test Plan

Run the tests. Note that creating the desktop disk
image doesn't work ATM, so I can't verify the desktop test
works, but the minimal one seems to (with D565). There'll be
a matching diff for openqa_fedora_tools to update the test
case names there.

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 convert upgrade tests to dnf-plugin-system-upgrade.Sep 9 2015, 7:47 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
jskladan accepted this revision.Sep 9 2015, 8:17 AM
This revision is now accepted and ready to land.Sep 9 2015, 8:17 AM
adamwill updated this revision to Diff 1484.Sep 9 2015, 5:58 PM

tweak needle, nogpgcheck for branched, check version on desktop

The version ident string can apparently vary a bit in Rawhide(?)
so make the needle a bit looser. To cover the pre-Bodhi-enable
phase, use --nogpgcheck for all 'branched' builds (that is, all
branched nightlies). And check that the upgrade actually
happened, in the desktop case.

adamwill updated this revision to Diff 1485.Sep 9 2015, 9:30 PM

more robust installed release check

The 'MOTD' string can change between flavors, so it's not good
to rely on it, and in particular you can't use it to identify
Rawhide Workstation. We could cat /etc/fedora-release, which is
part of fedora-release and doesn't change with the flavors, but
looking at the fedora-release spec, I think this is probably
the most robust way: this value should always be what we want
it to be.

adamwill updated this revision to Diff 1486.Sep 9 2015, 9:31 PM

drop the now-unneeded console_*_installed needles

adamwill updated this revision to Diff 1487.Sep 9 2015, 9:44 PM

fix the branched nogpgcheck check

it's the milestone, not the release.

adamwill updated this revision to Diff 1488.Sep 9 2015, 9:53 PM

document check_release

adamwill added a comment.Sep 9 2015, 9:54 PM

I hit a couple of problems in testing Workstation upgrades right now: it seems like the GDM "Sign In" button is not blue any more which is breaking that needle match. But it looks like it would work without those glitches. Minimal upgrade from 22 to both 23 and Rawhide works.

adamwill updated this revision to Diff 1489.Sep 10 2015, 12:44 AM

drop login button match from graphical_login_gdm

We don't actually need to match the login button, there's no
reason to check it's there and we're not clicking it (we hit
'enter'). In F23 and F24 the button is not sensitive until
you've typed at least one character of the password, so if we
kept this match, we'd need a new needle. To avoid this, just
drop the area entirely.

garretraziel accepted this revision.Sep 10 2015, 11:38 AM

Yup, seems to work OK.

lib/installedtest.pm
42

I like this, it's smart.

Closed by commit rOPENQATESTS68acecb6d480: convert upgrade tests to dnf-plugin-system-upgrade (authored by adamwill). · Explain WhySep 10 2015, 9:49 PM
This revision was automatically updated to reflect the committed changes.
adamwill mentioned this in rOPENQA74d76d422773: update for DNF upgrade testing.

Revision Contents

Diff 1491

View Options

README.md

Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)111 - `custom_delete_part()` is used for deletion of previously added partitions in custom partitioning spoke. It should
113 `anaconda_part_select_$part` should exist. Example usage: `$self->custom_delete_part('swap');` uses 113​ `anaconda_part_select_$part` should exist. Example usage: `$self->custom_delete_part('swap');` uses
114 `anaconda_part_select_swap` to delete previously added swap partition. 114​ `anaconda_part_select_swap` to delete previously added swap partition.
115- `installedtest` should be used in tests that are running on installed system (either in postinstall phase 115​- `installedtest` should be used in tests that are running on installed system (either in postinstall phase
116or in upgrade tests). It uploads `/var/log` in `post_fail_hook()`. It provides these functions: 116​or in upgrade tests). It uploads `/var/log` in `post_fail_hook()`. It provides these functions:
117 - `root_console()` tries to login is as a root. It switches to TTY that is set as an argument (default is TTY1) 117​ - `root_console()` tries to login is as a root. It switches to TTY that is set as an argument (default is TTY1)
118 and then calls `console_login()` for root. If you set `check` argument, it dies if it fails to log in. 118​ and then calls `console_login()` for root. If you set `check` argument, it dies if it fails to log in.
119 Example usage: running `$self->root_console(tty=>2, check=>0);` results in TTY2 displayed with root logged 119​ Example usage: running `$self->root_console(tty=>2, check=>0);` results in TTY2 displayed with root logged
120 in. 120​ in.
121​ - `check_release()` checks whether the installed release matches a given value. E.g. `check_release(23)`
122​ checks whether the installed system is Fedora 23. The value can be 'Rawhide' or a Fedora release number;
123​ often you will want to use `get_var('VERSION')`. Expects a console prompt to be active when it is called.
121 124​
122### New test development workflow 125​### New test development workflow
123 126​
1241. Select test from [this document](https://bitbucket.org/rajcze/openqa_fedora_tools/src/develop/PhaseSeparation.md) or from 127​1. Select test from [this document](https://bitbucket.org/rajcze/openqa_fedora_tools/src/develop/PhaseSeparation.md) or from
125[phabricator page](https://phab.qadevel.cloud.fedoraproject.org/maniphest/?statuses=open%28%29&projects=PHID-PROJ-epofbmazit3u2rndqccd#R) 128​[phabricator page](https://phab.qadevel.cloud.fedoraproject.org/maniphest/?statuses=open%28%29&projects=PHID-PROJ-epofbmazit3u2rndqccd#R)
1262. Put each part of your test as a separate file into `tests/` directory, reimplementing `run()` method 129​2. Put each part of your test as a separate file into `tests/` directory, reimplementing `run()` method
127and `test_flags()` method, inheriting from one of the classes mentioned above. 130​and `test_flags()` method, inheriting from one of the classes mentioned above.
1283. Set correct variables (so that all test parts you have made are executed) in [WebUI -> Test suites](https://localhost:8080/admin/test_suites). 131​3. Set correct variables (so that all test parts you have made are executed) in [WebUI -> Test suites](https://localhost:8080/admin/test_suites).
1294. Link your newly created Test suite to medium type in [WebUI -> Job groups](https://localhost:8080/admin/groups). 132​4. Link your newly created Test suite to medium type in [WebUI -> Job groups](https://localhost:8080/admin/groups).
1305. Run test (see [openqa_fedora_tools repository](https://bitbucket.org/rajcze/openqa_fedora_tools)). 133​5. Run test (see [openqa_fedora_tools repository](https://bitbucket.org/rajcze/openqa_fedora_tools)).
1316. Create needles (images) by using interactive mode and needles editor in WebUI. 134​6. Create needles (images) by using interactive mode and needles editor in WebUI.
1327. Add new Job template and Test suite into `templates` file. 135​7. Add new Job template and Test suite into `templates` file.
1338. Add new Test suite and Test case into [`conf_test_suites.py`](https://bitbucket.org/rajcze/openqa_fedora_tools/src/develop/tools/openqa_trigger/conf_test_suites.py) 136​8. Add new Test suite and Test case into [`conf_test_suites.py`](https://bitbucket.org/rajcze/openqa_fedora_tools/src/develop/tools/openqa_trigger/conf_test_suites.py)
134file in openqa_fedora_tools repository. 137​file in openqa_fedora_tools repository.
1359. Mark your test in PhaseSeparation.md as done. 138​9. Mark your test in PhaseSeparation.md as done.
13610. Open differential request via phabricator, set openqa_fedora as a project and repository. 139​10. Open differential request via phabricator, set openqa_fedora as a project and repository.
View Options

lib/installedtest.pm

Show All 29 Lines22sub post_fail_hook {
30 upload_logs "/var/tmp/abrt/abrt.tar.gz"; 30​ upload_logs "/var/tmp/abrt/abrt.tar.gz";
31 31​
32 # Upload /var/log 32​ # Upload /var/log
33 type_string "tar czvf /tmp/var_log.tar.gz /var/log"; 33​ type_string "tar czvf /tmp/var_log.tar.gz /var/log";
34 send_key "ret"; 34​ send_key "ret";
35 upload_logs "/tmp/var_log.tar.gz"; 35​ upload_logs "/tmp/var_log.tar.gz";
36} 36​}
37 37​
38​sub check_release {
39​ my $self = shift;
40​ my $release = shift;
41​ type_string "clear\n";
42​ type_string "grep SUPPORT_PRODUCT_VERSION /usr/lib/os.release.d/os-release-fedora | grep -q ${release}\n";
garretrazielUnsubmitted
Not Done

I like this, it's smart.

43​ type_string "echo \$?\n";
44​ assert_screen "console_command_success";
45​}
46​
381; 47​1;
39 48​
40# vim: set sw=4 et: 49​# vim: set sw=4 et:
View Options

main.pm

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)
52# if user set ENTRYPOINT, run required test directly 52​# if user set ENTRYPOINT, run required test directly
53# (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.) 53​# (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.)
54if (get_var("ENTRYPOINT")) 54​if (get_var("ENTRYPOINT"))
55{ 55​{
56 autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm"; 56​ autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm";
57} 57​}
58elsif (get_var("UPGRADE")) 58​elsif (get_var("UPGRADE"))
59{ 59​{
60 # all upgrade tests consist of: preinstall phase (where packages are upgraded and fedup is 60​ # all upgrade tests consist of: preinstall phase (where packages are upgraded and
61 # installed), run phase (where fedup is run) and postinstall phase (where is checked if 61​ # dnf-plugin-system-upgrade is installed), run phase (where upgrade is run) and postinstall
62 # fedora was upgraded successfully) 62​ # phase (where is checked if fedora was upgraded successfully)
63 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_preinstall.pm"; 63​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_preinstall.pm";
64 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_run.pm"; 64​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_run.pm";
65 # UPGRADE can be set to "minimal", "encrypted", "desktop"... 65​ # UPGRADE can be set to "minimal", "encrypted", "desktop"...
66 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_postinstall_".get_var("UPGRADE").".pm"; 66​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_postinstall_".get_var("UPGRADE").".pm";
67} 67​}
68else 68​else
69{ 69​{
70 # normal installation test consists of several phases, from which some of them are 70​ # normal installation test consists of several phases, from which some of them are
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines
View Options

needles/console_f22_installed.json

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

needles/console_f22_installed.png

  • This binary file was deleted.
View Options

needles/graphical_login_gdm_input.json

1{ 1​{
2 "area": [ 2​ "area": [
3 { 3​ {
4 "xpos": 341, ​
5 "ypos": 372, ​
6 "width": 343, ​
7 "height": 65, 4​ "height": 65,
8 "type": "match" 5​ "type": "match",
9 }, 6​ "width": 343,
10 { 7​ "xpos": 341,
11 "xpos": 600, 8​ "ypos": 372
12 "ypos": 470, ​
13 "width": 80, ​
14 "height": 30, ​
15 "type": "match" ​
16 } 9​ }
17 ], 10​ ],
11​ "properties": [],
18 "tags": [ 12​ "tags": [
19 "graphical_login_input", 13​ "graphical_login_input",
20 "ENV-DISTRI-fedora", 14​ "ENV-DISTRI-fedora",
21 "ENV-INSTLANG-en_US", 15​ "ENV-INSTLANG-en_US",
22 "ENV-FLAVOR-develop" 16​ "ENV-FLAVOR-develop"
23 ], 17​ ]
24 "properties": [] ​
25} 18​}
19​No newline at end of file
View Options

needles/grub_fedup.json

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

needles/grub_fedup.png

  • This binary file was deleted.
View Options

templates

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Line(s)8 JobTemplates => [
219 { 219​ {
220 machine => { name => "64bit" }, 220​ machine => { name => "64bit" },
221 product => { 221​ product => {
222 arch => "x86_64", 222​ arch => "x86_64",
223 distri => "fedora", 223​ distri => "fedora",
224 flavor => "universal", 224​ flavor => "universal",
225 version => "*", 225​ version => "*",
226 }, 226​ },
227 test_suite => { name => "fedup_minimal_64bit" }, 227​ test_suite => { name => "upgrade_minimal_64bit" },
228 }, 228​ },
229 { 229​ {
230 machine => { name => "64bit" }, 230​ machine => { name => "64bit" },
231 product => { 231​ product => {
232 arch => "x86_64", 232​ arch => "x86_64",
233 distri => "fedora", 233​ distri => "fedora",
234 flavor => "universal", 234​ flavor => "universal",
235 version => "*", 235​ version => "*",
236 }, 236​ },
237 test_suite => { name => "fedup_desktop_64bit" }, 237​ test_suite => { name => "upgrade_desktop_64bit" },
238 }, 238​ },
239 { 239​ {
240 machine => { name => "64bit" }, 240​ machine => { name => "64bit" },
241 product => { 241​ product => {
242 arch => "x86_64", 242​ arch => "x86_64",
243 distri => "fedora", 243​ distri => "fedora",
244 flavor => "universal", 244​ flavor => "universal",
245 version => "*", 245​ version => "*",
▲ Show 20 Lines • Show All 233 Lines • ▼ Show 20 Line(s)
479 { 479​ {
480 machine => { name => "32bit" }, 480​ machine => { name => "32bit" },
481 product => { 481​ product => {
482 arch => "i386", 482​ arch => "i386",
483 distri => "fedora", 483​ distri => "fedora",
484 flavor => "universal", 484​ flavor => "universal",
485 version => "*", 485​ version => "*",
486 }, 486​ },
487 test_suite => { name => "fedup_minimal_32bit" }, 487​ test_suite => { name => "upgrade_minimal_32bit" },
488 }, 488​ },
489 { 489​ {
490 machine => { name => "32bit" }, 490​ machine => { name => "32bit" },
491 product => { 491​ product => {
492 arch => "i386", 492​ arch => "i386",
493 distri => "fedora", 493​ distri => "fedora",
494 flavor => "universal", 494​ flavor => "universal",
495 version => "*", 495​ version => "*",
496 }, 496​ },
497 test_suite => { name => "fedup_desktop_32bit" }, 497​ test_suite => { name => "upgrade_desktop_32bit" },
498 }, 498​ },
499 { 499​ {
500 machine => { name => "32bit" }, 500​ machine => { name => "32bit" },
501 product => { 501​ product => {
502 arch => "i386", 502​ arch => "i386",
503 distri => "fedora", 503​ distri => "fedora",
504 flavor => "universal", 504​ flavor => "universal",
505 version => "*", 505​ version => "*",
▲ Show 20 Lines • Show All 290 Lines • ▼ Show 20 Line(s)792 settings => [
796 { key => "HDD_2", value => "disk_ks.img" }, 796​ { key => "HDD_2", value => "disk_ks.img" },
797 { key => "ROOT_PASSWORD", value => "111111" }, 797​ { key => "ROOT_PASSWORD", value => "111111" },
798 { key => "USER_LOGIN", value => "test" }, 798​ { key => "USER_LOGIN", value => "test" },
799 { key => "USER_PASSWORD", value => "test" }, 799​ { key => "USER_PASSWORD", value => "test" },
800 ], 800​ ],
801 variables => "", 801​ variables => "",
802 }, 802​ },
803 { 803​ {
804 name => "fedup_minimal_64bit", 804​ name => "upgrade_minimal_64bit",
805 prio => 19, 805​ prio => 19,
806 settings => [ 806​ settings => [
807 { key => "ROOT_PASSWORD", value => "weakpassword" }, 807​ { key => "ROOT_PASSWORD", value => "weakpassword" },
808 { key => "BOOTFROM", value => "c" }, 808​ { key => "BOOTFROM", value => "c" },
809 { key => "HDD_1", value => "disk_f22_minimal_x86_64.img" }, 809​ { key => "HDD_1", value => "disk_f22_minimal_x86_64.img" },
810 { key => "UPGRADE", value => "minimal" }, 810​ { key => "UPGRADE", value => "minimal" },
811 ], 811​ ],
812 variables => "", 812​ variables => "",
813 }, 813​ },
814 { 814​ {
815 name => "fedup_desktop_64bit", 815​ name => "upgrade_desktop_64bit",
816 prio => 20, 816​ prio => 20,
817 settings => [ 817​ settings => [
818 { key => "ROOT_PASSWORD", value => "weakpassword" }, 818​ { key => "ROOT_PASSWORD", value => "weakpassword" },
819 { key => "BOOTFROM", value => "c" }, 819​ { key => "BOOTFROM", value => "c" },
820 { key => "HDD_1", value => "disk_f22_desktop_x86_64.img" }, 820​ { key => "HDD_1", value => "disk_f22_desktop_x86_64.img" },
821 { key => "UPGRADE", value => "desktop" }, 821​ { key => "UPGRADE", value => "desktop" },
822 ], 822​ ],
823 variables => "", 823​ variables => "",
824 }, 824​ },
825 { 825​ {
826 name => "fedup_minimal_32bit", 826​ name => "upgrade_minimal_32bit",
827 prio => 19, 827​ prio => 19,
828 settings => [ 828​ settings => [
829 { key => "ROOT_PASSWORD", value => "weakpassword" }, 829​ { key => "ROOT_PASSWORD", value => "weakpassword" },
830 { key => "BOOTFROM", value => "c" }, 830​ { key => "BOOTFROM", value => "c" },
831 { key => "HDD_1", value => "disk_f22_minimal_i686.img" }, 831​ { key => "HDD_1", value => "disk_f22_minimal_i686.img" },
832 { key => "UPGRADE", value => "minimal" }, 832​ { key => "UPGRADE", value => "minimal" },
833 ], 833​ ],
834 variables => "", 834​ variables => "",
835 }, 835​ },
836 { 836​ {
837 name => "fedup_desktop_32bit", 837​ name => "upgrade_desktop_32bit",
838 prio => 20, 838​ prio => 20,
839 settings => [ 839​ settings => [
840 { key => "ROOT_PASSWORD", value => "weakpassword" }, 840​ { key => "ROOT_PASSWORD", value => "weakpassword" },
841 { key => "BOOTFROM", value => "c" }, 841​ { key => "BOOTFROM", value => "c" },
842 { key => "HDD_1", value => "disk_f22_desktop_i686.img" }, 842​ { key => "HDD_1", value => "disk_f22_desktop_i686.img" },
843 { key => "UPGRADE", value => "desktop" }, 843​ { key => "UPGRADE", value => "desktop" },
844 ], 844​ ],
845 variables => "", 845​ variables => "",
Show All 34 Lines
View Options

tests/upgrade_postinstall_desktop.pm

Show All 11 Lines6sub run {
12 12​
13 # login as normal user 13​ # login as normal user
14 send_key "ret"; 14​ send_key "ret";
15 assert_screen "graphical_login_input"; 15​ assert_screen "graphical_login_input";
16 type_string $password; 16​ type_string $password;
17 send_key "ret"; 17​ send_key "ret";
18 # wait until desktop appears 18​ # wait until desktop appears
19 assert_screen "graphical_desktop_clean", 30; 19​ assert_screen "graphical_desktop_clean", 30;
20​ # check an upgrade actually happened (and we can log into a console)
21​ $self->root_console(tty=>3);
22​ $self->check_release(get_var('VERSION'));
20} 23​}
21 24​
22 25​
23sub test_flags { 26​sub test_flags {
24 # without anything - rollback to 'lastgood' snapshot if failed 27​ # without anything - rollback to 'lastgood' snapshot if failed
25 # 'fatal' - whole test suite is in danger if this fails 28​ # 'fatal' - whole test suite is in danger if this fails
26 # 'milestone' - after this test succeeds, update 'lastgood' 29​ # 'milestone' - after this test succeeds, update 'lastgood'
27 # 'important' - if this fails, set the overall state to 'fail' 30​ # 'important' - if this fails, set the overall state to 'fail'
28 return { fatal => 1 }; 31​ return { fatal => 1 };
29} 32​}
30 33​
311; 34​1;
32 35​
33# vim: set sw=4 et: 36​# vim: set sw=4 et:
View Options

tests/upgrade_postinstall_minimal.pm

1use base "installedtest"; 1​use base "installedtest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5 5​
6sub run { 6​sub run {
7 my $self = shift; 7​ my $self = shift;
8 8​
9 # try to login, check whether F22 is installed 9​ # try to login, check whether target release is installed
10 $self->boot_to_login_screen(); 10​ $self->boot_to_login_screen();
11 $self->root_console(tty=>3); 11​ $self->root_console(tty=>3);
12 12​ $self->check_release(get_var('VERSION'));
13 assert_screen "console_f22_installed"; ​
14} 13​}
15 14​
16 15​
17sub test_flags { 16​sub test_flags {
18 # without anything - rollback to 'lastgood' snapshot if failed 17​ # without anything - rollback to 'lastgood' snapshot if failed
19 # 'fatal' - whole test suite is in danger if this fails 18​ # 'fatal' - whole test suite is in danger if this fails
20 # 'milestone' - after this test succeeds, update 'lastgood' 19​ # 'milestone' - after this test succeeds, update 'lastgood'
21 # 'important' - if this fails, set the overall state to 'fail' 20​ # 'important' - if this fails, set the overall state to 'fail'
22 return { fatal => 1 }; 21​ return { fatal => 1 };
23} 22​}
24 23​
251; 24​1;
26 25​
27# vim: set sw=4 et: 26​# vim: set sw=4 et:
View Options

tests/upgrade_preinstall.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 $self = shift; 6​ my $self = shift;
7 7​
8 # wait for either GDM or text login 8​ # wait for either GDM or text login
9 if (get_var('UPGRADE') eq "desktop") { 9​ if (get_var('UPGRADE') eq "desktop") {
10 $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load 10​ $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
11 } else { 11​ } else {
12 $self->boot_to_login_screen(); 12​ $self->boot_to_login_screen();
13 } 13​ }
14 # switch to TTY3 for both, graphical and console tests 14​ # switch to TTY3 for both, graphical and console tests
15 $self->root_console(tty=>3); 15​ $self->root_console(tty=>3);
16 16​
17 # fedup should be installed on up-to-date system 17​ # upgrader should be installed on up-to-date system
18 18​
19 type_string 'yum -y update; echo $?'; 19​ type_string 'dnf -y update; echo $?';
20 send_key "ret"; 20​ send_key "ret";
21 21​
22 assert_screen "console_command_success", 1800; 22​ assert_screen "console_command_success", 1800;
23 23​
24 type_string "reboot"; 24​ type_string "reboot";
25 send_key "ret"; 25​ send_key "ret";
26 26​
27 if (get_var('UPGRADE') eq "desktop") { 27​ if (get_var('UPGRADE') eq "desktop") {
28 $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load 28​ $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
29 } else { 29​ } else {
30 $self->boot_to_login_screen(); 30​ $self->boot_to_login_screen();
31 } 31​ }
32 $self->root_console(tty=>3); 32​ $self->root_console(tty=>3);
33 33​
34 type_string 'yum -y install fedup; echo $?'; 34​ type_string 'dnf -y --enablerepo=updates-testing install dnf-plugin-system-upgrade; echo $?';
35 send_key "ret"; 35​ send_key "ret";
36 36​
37 assert_screen "console_command_success", 1800; 37​ assert_screen "console_command_success", 1800;
38} 38​}
39 39​
40 40​
41sub test_flags { 41​sub test_flags {
42 # without anything - rollback to 'lastgood' snapshot if failed 42​ # without anything - rollback to 'lastgood' snapshot if failed
Show All 9 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 $fedup_url; 6​ my $release = lc(get_var('VERSION'));
7 my $to_version; 7​ my $milestone = lc((split /_/, get_var("BUILD"))[1]);
8 # FIXME: this is just a workaround, see https://phab.qadevel.cloud.fedoraproject.org/T478 8​ my $args = "--releasever=${release}";
9 # construct download URL 9​ # This is excessive - after the Bodhi activation point we don't
10 if (get_var("BUILD") =~ /^(\d+)_Final_(.*)$/) { 10​ # need --nogpgcheck for Branched. But that's hard to detect magically
11 $fedup_url = "https://dl.fedoraproject.org/pub/alt/stage/".$1."_".$2."/Server/".get_var("ARCH")."/os"; 11​ if ($release eq 'rawhide' or $milestone eq 'branched') {
12 $to_version = $1; 12​ $args .= " --nogpgcheck";
13 } else { ​
14 $fedup_url = "https://dl.fedoraproject.org/pub/alt/stage/".get_var("BUILD")."/Server/".get_var("ARCH")."/os"; ​
15 get_var("BUILD") =~ /^(\d+)/; ​
16 $to_version = $1; ​
17 } 13​ }
18 14​ type_string "dnf -y system-upgrade download ${args}";
19 type_string "fedup --network ".$to_version." --instrepo ".$fedup_url; ​
20 send_key "ret"; 15​ send_key "ret";
21 16​
22 # wait untill fedup finishes its work (screen stops moving for 30 seconds) 17​ # wait until dnf finishes its work (screen stops moving for 30 seconds)
23 wait_still_screen 30, 6000; # TODO: shorter timeout, longer stillscreen? 18​ wait_still_screen 30, 6000; # TODO: shorter timeout, longer stillscreen?
24 19​
25 upload_logs "/var/log/fedup.log"; 20​ upload_logs "/var/log/dnf.log";
26 21​ upload_logs "/var/log/dnf.rpm.log";
27 type_string "reboot"; ​
28 send_key "ret"; ​
29 22​
30 # check that "upgrade" item is shown in GRUB 23​ type_string "dnf system-upgrade reboot";
31 assert_screen "grub_fedup", 30; ​
32 send_key "ret"; 24​ send_key "ret";
33 25​
34 # now offline upgrading starts. user doesn't have to do anything, just wait untill 26​ # now offline upgrading starts. user doesn't have to do anything, just wait untill
35 # system reboots and login screen is shown 27​ # system reboots and login screen is shown
36 if (get_var('UPGRADE') eq "desktop") { 28​ if (get_var('UPGRADE') eq "desktop") {
37 assert_screen "graphical_login", 6000; 29​ assert_screen "graphical_login", 6000;
38 } else { 30​ } else {
39 assert_screen "text_console_login", 6000; 31​ assert_screen "text_console_login", 6000;
Show All 15 Lines