tweak upgrade tests a bit

Noticed some problems with the commit while testing it: we
weren't doing 32-bit minimal (to avoid having too many tests,
I think) so let's not do it for upgrade_2 for now, and also
the arch on one test was wrong.
This commit is contained in:
Adam Williamson 2015-12-07 10:02:45 -08:00
parent 4eb09e6cfb
commit cc963263e9

View File

@ -449,17 +449,7 @@
{
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",
arch => "i686",
distri => "fedora",
flavor => "universal",
version => "*",
@ -1043,17 +1033,6 @@
],
variables => "",
},
{
name => "upgrade_2_minimal_32bit",
prio => 19,
settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_f22_minimal_i686.img" },
{ key => "UPGRADE", value => "minimal" },
],
variables => "",
},
{
name => "upgrade_2_desktop_32bit",
prio => 20,