Adds variable PART_TABLE_TYPE to machines

PART_TABLE_TYPE variable says which type of partition table type
should be on attached HDDs.
Some tests with uefi have to use disks with gpt.
Tests are amended to use right disks.

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D623
This commit is contained in:
Petr Schindler 2015-10-15 16:07:00 +02:00
parent 2f1216c3b0
commit 079efe72e8
2 changed files with 13 additions and 9 deletions

View File

@ -27,6 +27,7 @@ These variables control settings of underlying virtual machine where tests runs
| `MAKETESTSNAPSHOTS` | boolean | `false`/not set | save snapshot for each test | | `MAKETESTSNAPSHOTS` | boolean | `false`/not set | save snapshot for each test |
| `NOVIDEO` | boolean | `false`/not set | don't create video output if set | | `NOVIDEO` | boolean | `false`/not set | don't create video output if set |
| `NUMDISKS` | integer | 1 | number of disks to be created and attached to VM | | `NUMDISKS` | integer | 1 | number of disks to be created and attached to VM |
| `PART_TABLE_TYPE` | `mbr`, `gpt` | not set | what type of partition table should attached HDD have |
| `PXEBOOT` | boolean | `false`/not set | boot VM from PXE (network) | | `PXEBOOT` | boolean | `false`/not set | boot VM from PXE (network) |
| `QEMU` | filename, path to Qemu binary | not set | filename of Qemu binary | | `QEMU` | filename, path to Qemu binary | not set | filename of Qemu binary |
| `QEMUCPU` | see `qemu-kvm -cpu help` | not set | CPU to emulate | | `QEMUCPU` | see `qemu-kvm -cpu help` | not set | CPU to emulate |

View File

@ -595,7 +595,8 @@
{ key => "QEMUCPU", value => "qemu64" }, { key => "QEMUCPU", value => "qemu64" },
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUVGA", value => "std"}, { key => "QEMUVGA", value => "std"},
{ key => "QEMURAM", value => "2048"} { key => "QEMURAM", value => "2048"},
{ key => "PART_TABLE_TYPE", value => "mbr"}
], ],
variables => "", variables => "",
}, },
@ -606,7 +607,8 @@
{ key => "QEMUCPU", value => "qemu32" }, { key => "QEMUCPU", value => "qemu32" },
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUVGA", value => "std"}, { key => "QEMUVGA", value => "std"},
{ key => "QEMURAM", value => "2048"} { key => "QEMURAM", value => "2048"},
{ key => "PART_TABLE_TYPE", value => "mbr"}
], ],
variables => "", variables => "",
}, },
@ -618,7 +620,8 @@
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUVGA", value => "std"}, { key => "QEMUVGA", value => "std"},
{ key => "QEMURAM", value => "2048"}, { key => "QEMURAM", value => "2048"},
{ key => "UEFI", value => "1"} { key => "UEFI", value => "1"},
{ key => "PART_TABLE_TYPE", value => "gpt"}
], ],
variables => "", variables => "",
}, },
@ -788,7 +791,7 @@
{ key => "PARTITIONING", value => "guided_multi" }, { key => "PARTITIONING", value => "guided_multi" },
{ key => "HDDMODEL", value => "ide-hd,bus=ahci0.0" }, { key => "HDDMODEL", value => "ide-hd,bus=ahci0.0" },
{ key => "NUMDISKS", value => "2" }, { key => "NUMDISKS", value => "2" },
{ key => "HDD_2", value => "disk_full.img" }, { key => "HDD_2", value => "disk_full_mbr.img" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
], ],
variables => "", variables => "",
@ -821,7 +824,7 @@
settings => [ settings => [
{ key => "PARTITIONING", value => "guided_delete_all" }, { key => "PARTITIONING", value => "guided_delete_all" },
{ key => "HDDMODEL", value => "ide-hd" }, { key => "HDDMODEL", value => "ide-hd" },
{ key => "HDD_1", value => "disk_full.img" }, { key => "HDD_1", value => "disk_full_mbr.img" },
], ],
variables => "", variables => "",
}, },
@ -854,7 +857,7 @@
prio => 9, prio => 9,
settings => [ settings => [
{ key => "PARTITIONING", value => "guided_delete_partial" }, { key => "PARTITIONING", value => "guided_delete_partial" },
{ key => "HDD_1", value => "disk_full.img" }, { key => "HDD_1", value => "disk_full_%PART_TABLE_TYPE%.img" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
], ],
variables => "", variables => "",
@ -872,7 +875,7 @@
prio => 11, prio => 11,
settings => [ settings => [
{ key => "PARTITIONING", value => "guided_free_space" }, { key => "PARTITIONING", value => "guided_free_space" },
{ key => "HDD_1", value => "disk_freespace.img" }, { key => "HDD_1", value => "disk_freespace_%PART_TABLE_TYPE%.img" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
], ],
variables => "", variables => "",
@ -1007,7 +1010,7 @@
prio => 22, prio => 22,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "HDD_1", value => "disk_shrink_ext4.img" }, { key => "HDD_1", value => "disk_shrink_ext4_mbr.img" },
{ key => "PARTITIONING", value => "guided_shrink" }, { key => "PARTITIONING", value => "guided_shrink" },
], ],
variables => "", variables => "",
@ -1017,7 +1020,7 @@
prio => 23, prio => 23,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "HDD_1", value => "disk_shrink_ntfs.img" }, { key => "HDD_1", value => "disk_shrink_ntfs_mbr.img" },
{ key => "PARTITIONING", value => "guided_shrink" }, { key => "PARTITIONING", value => "guided_shrink" },
], ],
variables => "", variables => "",