add f23 upgrade tests, rename f22 upgrade tests

Summary:
This bumps the existing upgrade tests to F23, and drops the
32-bit ones for now, as there is no 32-bit F23 base image for
virt-builder - RHBZ #1288733. It then adds new tests named
'upgrade_2_(etc)' and associates them with the F22 images. The
intent is that we should always have two sets of upgrade tests,
one for each of the currently-supported stable releases; when
we bump to testing F25, the 'upgrade' tests will be bumped to
F24 and the 'upgrade_2' tests to F23, and so on. There will be
a matching diff for openqa_fedora_tools.

Test Plan:
Execute a test run and make sure all the upgrade
tests run; of course you need to make sure you've built the
required disk images.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D679
This commit is contained in:
Adam Williamson 2015-12-07 09:42:55 -08:00
parent 163a8fd94a
commit 4eb09e6cfb

View File

@ -426,6 +426,46 @@
}, },
test_suite => { name => "upgrade_desktop_64bit" }, test_suite => { name => "upgrade_desktop_64bit" },
}, },
{
machine => { name => "64bit" },
product => {
arch => "x86_64",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_minimal_64bit" },
},
{
machine => { name => "64bit" },
product => {
arch => "x86_64",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_desktop_64bit" },
},
{
machine => { name => "64bit" },
product => {
arch => "x86_64",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_minimal_32bit" },
},
{
machine => { name => "64bit" },
product => {
arch => "x86_64",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_desktop_32bit" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
product => { product => {
@ -965,7 +1005,7 @@
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_f22_minimal_x86_64.img" }, { key => "HDD_1", value => "disk_f23_minimal_x86_64.img" },
{ key => "UPGRADE", value => "minimal" }, { key => "UPGRADE", value => "minimal" },
], ],
variables => "", variables => "",
@ -973,6 +1013,28 @@
{ {
name => "upgrade_desktop_64bit", name => "upgrade_desktop_64bit",
prio => 20, prio => 20,
settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_f23_desktop_x86_64.img" },
{ key => "UPGRADE", value => "desktop" },
],
variables => "",
},
{
name => "upgrade_2_minimal_64bit",
prio => 19,
settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_f22_minimal_x86_64.img" },
{ key => "UPGRADE", value => "minimal" },
],
variables => "",
},
{
name => "upgrade_2_desktop_64bit",
prio => 20,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
@ -982,7 +1044,7 @@
variables => "", variables => "",
}, },
{ {
name => "upgrade_minimal_32bit", name => "upgrade_2_minimal_32bit",
prio => 19, prio => 19,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
@ -993,7 +1055,7 @@
variables => "", variables => "",
}, },
{ {
name => "upgrade_desktop_32bit", name => "upgrade_2_desktop_32bit",
prio => 20, prio => 20,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },