From 079efe72e8844340d4bbbd9530a037c38b40838e Mon Sep 17 00:00:00 2001
From: Petr Schindler <pschindl@redhat.com>
Date: Thu, 15 Oct 2015 16:07:00 +0200
Subject: [PATCH] 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
---
 VARIABLES.md |  1 +
 templates    | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/VARIABLES.md b/VARIABLES.md
index 49f30429..820d6684 100644
--- a/VARIABLES.md
+++ b/VARIABLES.md
@@ -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 |
 | `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 |
+| `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) |
 | `QEMU` | filename, path to Qemu binary | not set | filename of Qemu binary |
 | `QEMUCPU` | see `qemu-kvm -cpu help` | not set | CPU to emulate |
diff --git a/templates b/templates
index 4742ea7e..b0f91b09 100755
--- a/templates
+++ b/templates
@@ -595,7 +595,8 @@
                         { key => "QEMUCPU", value => "qemu64" },
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUVGA", value => "std"},
-                        { key => "QEMURAM", value => "2048"}
+                        { key => "QEMURAM", value => "2048"},
+                        { key => "PART_TABLE_TYPE", value => "mbr"}
                       ],
                       variables => "",
                     },
@@ -606,7 +607,8 @@
                         { key => "QEMUCPU", value => "qemu32" },
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUVGA", value => "std"},
-                        { key => "QEMURAM", value => "2048"}
+                        { key => "QEMURAM", value => "2048"},
+                        { key => "PART_TABLE_TYPE", value => "mbr"}
                       ],
                       variables => "",
                     },
@@ -618,7 +620,8 @@
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUVGA", value => "std"},
                         { key => "QEMURAM", value => "2048"},
-                        { key => "UEFI", value => "1"}
+                        { key => "UEFI", value => "1"},
+                        { key => "PART_TABLE_TYPE", value => "gpt"}
                       ],
                       variables => "",
                     },
@@ -788,7 +791,7 @@
                         { key => "PARTITIONING", value => "guided_multi" },
                         { key => "HDDMODEL", value => "ide-hd,bus=ahci0.0" },
                         { key => "NUMDISKS", value => "2" },
-                        { key => "HDD_2", value => "disk_full.img" },
+                        { key => "HDD_2", value => "disk_full_mbr.img" },
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                       ],
                       variables => "",
@@ -821,7 +824,7 @@
                       settings => [
                         { key => "PARTITIONING", value => "guided_delete_all" },
                         { key => "HDDMODEL", value => "ide-hd" },
-                        { key => "HDD_1", value => "disk_full.img" },
+                        { key => "HDD_1", value => "disk_full_mbr.img" },
                       ],
                       variables => "",
                     },
@@ -854,7 +857,7 @@
                       prio => 9,
                       settings => [
                         { 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" },
                       ],
                       variables => "",
@@ -872,7 +875,7 @@
                       prio => 11,
                       settings => [
                         { 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" },
                       ],
                       variables => "",
@@ -1007,7 +1010,7 @@
                       prio => 22,
                       settings => [
                         { 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" },
                       ],
                       variables => "",
@@ -1017,7 +1020,7 @@
                       prio => 23,
                       settings => [
                         { 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" },
                       ],
                       variables => "",