testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

tweak upgrade tests again

Browse Source 
damnit, that was still wrong. This should do the trick: we can
do 32-bit F23 upgrade tests now (virt-builder added the base
image we need), so re-add that, and put things in the best
order and fix the priorities.
This commit is contained in:
Adam Williamson 2015-12-07 10:10:08 -08:00
parent cc963263e9
commit 9402860ec8
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
templates
View File

@ -446,16 +446,6 @@
}, },
test_suite => { name => "upgrade_2_desktop_64bit" }, test_suite => { name => "upgrade_2_desktop_64bit" },
}, },
{
machine => { name => "64bit" },
product => {
arch => "i686",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_desktop_32bit" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
product => { product => {
@ -636,6 +626,16 @@
}, },
test_suite => { name => "upgrade_desktop_32bit" }, test_suite => { name => "upgrade_desktop_32bit" },
} }
{
machine => { name => "64bit" },
product => {
arch => "i386",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "upgrade_2_desktop_32bit" },
},
], ],
Machines => [ Machines => [
{ {
@ -1013,7 +1013,7 @@
}, },
{ {
name => "upgrade_2_minimal_64bit", name => "upgrade_2_minimal_64bit",
prio => 19, prio => 21,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
@ -1024,7 +1024,7 @@
}, },
{ {
name => "upgrade_2_desktop_64bit", name => "upgrade_2_desktop_64bit",
prio => 20, prio => 22,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
@ -1033,9 +1033,20 @@
], ],
variables => "", variables => "",
}, },
{
name => "upgrade_desktop_32bit",
prio => 23,
settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_f23_desktop_i686.img" },
{ key => "UPGRADE", value => "desktop" },
],
variables => "",
},
{ {
name => "upgrade_2_desktop_32bit", name => "upgrade_2_desktop_32bit",
prio => 20, prio => 24,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
@ -1046,7 +1057,7 @@
}, },
{ {
name => "server_updates_img_local", name => "server_updates_img_local",
prio => 21, prio => 25,
settings => [ settings => [
{ key => "NUMDISKS", value => "2" }, { key => "NUMDISKS", value => "2" },
{ key => "HDD_2", value => "disk_updates_img.img" }, { key => "HDD_2", value => "disk_updates_img.img" },
@ -1057,7 +1068,7 @@
}, },
{ {
name => "server_shrink_ext4", name => "server_shrink_ext4",
prio => 22, prio => 26,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "HDD_1", value => "disk_shrink_ext4_mbr.img" }, { key => "HDD_1", value => "disk_shrink_ext4_mbr.img" },
@ -1067,7 +1078,7 @@
}, },
{ {
name => "server_shrink_ntfs", name => "server_shrink_ntfs",
prio => 23, prio => 27,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "HDD_1", value => "disk_shrink_ntfs_mbr.img" }, { key => "HDD_1", value => "disk_shrink_ntfs_mbr.img" },
@ -1077,7 +1088,7 @@
}, },
{ {
name => "european_language_install", name => "european_language_install",
prio => 24, prio => 28,
settings => [ settings => [
{ key => "LANGUAGE", value => "french" }, { key => "LANGUAGE", value => "french" },
{ key => "USER_LOGIN", value => "qwerty" }, { key => "USER_LOGIN", value => "qwerty" },
@ -1088,7 +1099,7 @@
}, },
{ {
name => "server_xfs", name => "server_xfs",
prio => 25, prio => 29,
settings => [ settings => [
{ key => "PARTITIONING", value => "custom_xfs" }, { key => "PARTITIONING", value => "custom_xfs" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },