From cc963263e978f113fc0b451b7c901c0451b3a221 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 7 Dec 2015 10:02:45 -0800 Subject: [PATCH] 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. --- templates | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/templates b/templates index 35c1bdac..b5fa174d 100755 --- a/templates +++ b/templates @@ -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,