From 475fcc0d19ff9ef9af4cb347b976b58a07ee4e9e Mon Sep 17 00:00:00 2001
From: Josef Skladanka <jskladan@redhat.com>
Date: Wed, 4 Feb 2015 14:05:20 +0100
Subject: [PATCH] Simplified the templates

---
 main.pm                         |  8 ++++----
 templates                       | 27 +++++++++++++++++++--------
 tests/_boot_to_anaconda.pm      | 24 +++++++-----------------
 tests/_wait_for_login_screen.pm |  2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/main.pm b/main.pm
index 05ddc1f1..60c1a445 100644
--- a/main.pm
+++ b/main.pm
@@ -43,15 +43,15 @@ else
 
 
         ## Disk partitioning
-        if (get_var('DISK_GUIDED_EMPTY')){
-            autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
-        }
-        elsif (get_var('DISK_GUIDED_MULTI')){
+        if (get_var('DISK_GUIDED_MULTI')){
             autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm";
         }
         elsif (get_var('DISK_GUIDED_DELETE_ALL')){
             autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm";
         }
+        else {
+            autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
+        }
 
         # Start installation, set user & root passwords, reboot
         autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm";
diff --git a/templates b/templates
index 3a54a130..9ce2270e 100755
--- a/templates
+++ b/templates
@@ -41,9 +41,7 @@
                     {
                       name => "server_simple",
                       prio => 1,
-                      settings => [
-                        { key => "DISK_GUIDED_EMPTY", value => "1" },
-                      ],
+                      settings => [],
                       variables => "",
                     },
                     {
@@ -54,7 +52,6 @@
                         { key => "HDDMODEL", value => "ide-hd,bus=ahci0.0" },
                         { key => "NUMDISKS", value => "2" },
                         { key => "HDD_2". value => "disk_full.img" },
-                        { key => "DO_LOGIN". value => "1" },
                         { key => "ROOT_PASSWORD". value => "weakpassword" },
                       ],
                       variables => "",
@@ -64,7 +61,7 @@
                       prio => 3,
                       settings => [
                         { key => "BOOT_UPDATES_IMG_URL", value => "1" },
-                        { key => "DISK_GUIDED_EMPTY", value => "1" },
+                        { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img" },
                         { key => "HDDMODEL", value => "virtio-scsi-pci" },
                       ],
                       variables => "",
@@ -74,8 +71,7 @@
                       prio => 4,
                       settings => [
                         { key => "KICKSTART", value => "1" },
-                        { key => "BOOT_KICKSTART_HTTP", value => "1" },
-                        { key => "DO_LOGIN", value => "1" },
+                        { key => "GRUB", value => "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks" },
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "test" },
                         { key => "ROOT_PASSWORD", value => "111111" },
@@ -88,10 +84,25 @@
                       settings => [
                         { key => "DISK_GUIDED_DELETE_ALL", value => "1" },
                         { key => "HDDMODEL", value => "ide-hd" },
-                        { key => "HDDVERSION", value => "Full disk" },
                         { key => "HDD_1", value => "disk_full.img" },
                       ],
                       variables => "",
                     },
+                    {
+                      name => "server_mirrorlist_graphical",
+                      prio => 6,
+                      settings => [
+                        { key => "MIRRORLIST_GRAPHICAL", value => "1" },
+                      ],
+                      variables => "",
+                    },
+                    {
+                      name => "server_repository_http_graphical",
+                      prio => 7,
+                      settings => [
+                        { key => "REPOSITORY_GRAPHICAL", value => "1" },
+                      ],
+                      variables => "",
+                    },
                   ],
 }
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 6ee5d58e..74900349 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -13,25 +13,15 @@ sub run {
         send_key "up";
     }
 
-    if ( get_var("KICKSTART") )
-    {
-        if ( get_var("BOOT_KICKSTART_HTTP") )
-        {
-            send_key "tab";
-            type_string " inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks";
-        }
-
-        send_key "ret";
+    if( get_var("GRUB")){
+        send_key "tab";
+        type_string " ".get_var("GRUB");
     }
-    else
-    {
-        if ( get_var("BOOT_UPDATES_IMG_URL") )
-        {
-            send_key "tab";
-            type_string " inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img";
-        }
 
-        send_key "ret";
+    send_key "ret";
+
+    unless (get_var("KICKSTART"))
+    {
         # Select install language
         assert_screen "anaconda_select_install_lang", 300;
         type_string "english";
diff --git a/tests/_wait_for_login_screen.pm b/tests/_wait_for_login_screen.pm
index cfbc6c9f..91ba115b 100644
--- a/tests/_wait_for_login_screen.pm
+++ b/tests/_wait_for_login_screen.pm
@@ -11,7 +11,7 @@ sub run {
     # Reboot and wait for the text login
     assert_screen "clean_install_login", $wait_time;
 
-    if (get_var("DO_LOGIN"))
+    if ((get_var("USER_LOGIN") && get_var("USER_PASSWORD")) || get_var("ROOT_PASSWORD"))
     {
         if (get_var("FLAVOR") eq "server")
         {