From 3554aac35ff59bf68ce4e8dfc3888f88def8d0bb Mon Sep 17 00:00:00 2001
From: Josef Skladanka <jskladan@redhat.com>
Date: Mon, 26 Jan 2015 14:39:49 +0100
Subject: [PATCH] Test Suites & docs

---
 InstallTests.md                               |   2 +-
 TestSuites.md                                 |  19 ++++++++++++++++++
 ...hub.json => anaconda_main_hub_server.json} |   4 ++--
 ...n_hub.png => anaconda_main_hub_server.png} | Bin
 ...bootloader.json => bootloader_server.json} |   4 ++--
 .../{bootloader.png => bootloader_server.png} | Bin
 fedora/templates                              |  17 ++++++++--------
 fedora/tests/install_simple.pm                |   6 +++---
 8 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 TestSuites.md
 rename fedora/needles/{anaconda_main_hub.json => anaconda_main_hub_server.json} (90%)
 rename fedora/needles/{anaconda_main_hub.png => anaconda_main_hub_server.png} (100%)
 rename fedora/needles/{bootloader.json => bootloader_server.json} (86%)
 rename fedora/needles/{bootloader.png => bootloader_server.png} (100%)

diff --git a/InstallTests.md b/InstallTests.md
index 590cedef..4387a62a 100644
--- a/InstallTests.md
+++ b/InstallTests.md
@@ -30,7 +30,7 @@
 * no swap
 
 # user interface
-* graphical implicitne
+* interface graphical
 * text?
 
 # installation repositories
diff --git a/TestSuites.md b/TestSuites.md
new file mode 100644
index 00000000..c07f838a
--- /dev/null
+++ b/TestSuites.md
@@ -0,0 +1,19 @@
+# server_simple
+
+## TESTS
+// get anaconda
+* disk_guided_empty
+// start installatin & reboot
+// wait for login screen
+
+## QEMU-vars
+
+
+## Covered testcases
+* server offline
+* virtio
+* guided empty
+* interface graphical
+* anaconda user creation
+
+
diff --git a/fedora/needles/anaconda_main_hub.json b/fedora/needles/anaconda_main_hub_server.json
similarity index 90%
rename from fedora/needles/anaconda_main_hub.json
rename to fedora/needles/anaconda_main_hub_server.json
index 6949b0b0..ca845cbd 100644
--- a/fedora/needles/anaconda_main_hub.json
+++ b/fedora/needles/anaconda_main_hub_server.json
@@ -44,9 +44,9 @@
     }
   ],
   "tags": [
-    "anaconda_main_hub",
+    "anaconda_main_hub_server",
     "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "ENV-INSTLANG-en_US"
   ]
-}
\ No newline at end of file
+}
diff --git a/fedora/needles/anaconda_main_hub.png b/fedora/needles/anaconda_main_hub_server.png
similarity index 100%
rename from fedora/needles/anaconda_main_hub.png
rename to fedora/needles/anaconda_main_hub_server.png
diff --git a/fedora/needles/bootloader.json b/fedora/needles/bootloader_server.json
similarity index 86%
rename from fedora/needles/bootloader.json
rename to fedora/needles/bootloader_server.json
index 80fae65f..90b2499a 100644
--- a/fedora/needles/bootloader.json
+++ b/fedora/needles/bootloader_server.json
@@ -16,9 +16,9 @@
     }
   ],
   "tags": [
-    "bootloader",
+    "bootloader_server",
     "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "ENV-INSTLANG-en_US"
   ]
-}
\ No newline at end of file
+}
diff --git a/fedora/needles/bootloader.png b/fedora/needles/bootloader_server.png
similarity index 100%
rename from fedora/needles/bootloader.png
rename to fedora/needles/bootloader_server.png
diff --git a/fedora/templates b/fedora/templates
index 88a3cd1a..be54ff28 100755
--- a/fedora/templates
+++ b/fedora/templates
@@ -7,14 +7,14 @@
 {
   JobTemplates => [
                     {
-                      machine    => { name => "32bit" },
+                      machine    => { name => "64bit" },
                       product    => {
                                       arch    => "x86_64",
-                                      distri  => "opensuse",
-                                      flavor  => "Promo-DVD-OpenSourcePress",
-                                      version => "Factory",
+                                      distri  => "fedora",
+                                      flavor  => "server",
+                                      version => "rawhide",
                                     },
-                      test_suite => { name => "gnome-live" },
+                      test_suite => { name => "Server Simple" },
                     },
                   ],
   Machines     => [
@@ -115,12 +115,11 @@
                   ],
   TestSuites   => [
                     {
-                      name => "RAID0",
+                      name => "Server Simple",
                       prio => 50,
                       settings => [
-                        { key => "DESKTOP", value => "kde" },
-                        { key => "INSTALLONLY", value => 1 },
-                        { key => "RAIDLEVEL", value => 0 },
+                        { key => "HDDMODEL", value => "virtio-blk" },
+                        { key => "PRODUCTNAME", value => "server" },
                       ],
                       variables => "",
                     },
diff --git a/fedora/tests/install_simple.pm b/fedora/tests/install_simple.pm
index d88ec711..e863d735 100644
--- a/fedora/tests/install_simple.pm
+++ b/fedora/tests/install_simple.pm
@@ -4,12 +4,12 @@ use testapi;
 
 sub run {
     # Wait for bootloader to appear
-    assert_screen "bootloader", 30;
+
+    assert_screen "bootloader_".get_var("FLAVOR"), 30;
 
     # Skip the media check
     send_key "up";
     send_key "ret";
-
     # Select install language
     assert_screen "anaconda_select_install_lang", 300;
     type_string "english";
@@ -18,7 +18,7 @@ sub run {
     assert_and_click "anaconda_select_install_lang_continue";
 
     # Anaconda hub
-    assert_screen "anaconda_main_hub", 300;
+    assert_screen "anaconda_main_hub_".get_var("FLAVOR"), 300; #
 
     # Default install destination (hdd should be empty for new KVM machine)
     assert_and_click "anaconda_main_hub_install_destination";