From a1bef836d79f9ab04d95d2d8ae8ecf2faec0720b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 5 May 2016 16:43:10 -0700
Subject: [PATCH] add desktop terminal test reporting, change 'ejohn' to 'test'

Summary:
This goes with D839. It makes the necessary changes to report
the results for the desktop-terminal tests, and changes the
username in the upgrade test disk images from 'ejohn' to 'test'
to be in line with the name used in all the other tests, and
save us having to change the 'user_logged_in' needles.

Test Plan:
Run with D839, check that all tests work and results
are correctly sent to the wiki.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D840
---
 desktop.commands | 4 ++--
 hdds.json        | 9 ++++++---
 kde.commands     | 4 ++--
 server.commands  | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/desktop.commands b/desktop.commands
index 9d20e10..17ccdd9 100644
--- a/desktop.commands
+++ b/desktop.commands
@@ -3,5 +3,5 @@ update
 selinux-relabel
 install @workstation-product-environment
 link /usr/lib/systemd/system/graphical.target:/etc/systemd/system/default.target
-firstboot-command useradd -m -p '' ejohn
-firstboot-command echo 'ejohn:weakpassword' | chpasswd
+firstboot-command useradd -m -p '' test
+firstboot-command echo 'test:weakpassword' | chpasswd
diff --git a/hdds.json b/hdds.json
index 8c1877d..6fa7256 100644
--- a/hdds.json
+++ b/hdds.json
@@ -137,14 +137,16 @@
                 "-1" : ["x86_64", "i686"],
                 "-2" : ["x86_64", "i686"]
             },
-            "size" : "20G"
+            "size" : "20G",
+            "imgver": "2"
         },
         {
             "name" : "server",
             "releases" : {
                 "-1" : ["x86_64", "i686"],
                 "-2" : ["x86_64", "i686"]
-            }
+            },
+            "imgver": "2"
         },
         {
             "name" : "kde",
@@ -152,7 +154,8 @@
                 "-1" : ["x86_64", "i686"],
                 "-2" : ["x86_64", "i686"]
             },
-            "size" : "20G"
+            "size" : "20G",
+            "imgver": "2"
         }
     ],
     "renames" : []
diff --git a/kde.commands b/kde.commands
index 02ac9ed..32d491b 100644
--- a/kde.commands
+++ b/kde.commands
@@ -3,5 +3,5 @@ update
 selinux-relabel
 install @kde-desktop-environment
 link /usr/lib/systemd/system/graphical.target:/etc/systemd/system/default.target
-firstboot-command useradd -m -p '' ejohn
-firstboot-command echo 'ejohn:weakpassword' | chpasswd
+firstboot-command useradd -m -p '' test
+firstboot-command echo 'test:weakpassword' | chpasswd
diff --git a/server.commands b/server.commands
index 148f519..4e88830 100644
--- a/server.commands
+++ b/server.commands
@@ -2,5 +2,5 @@ root-password password:weakpassword
 update
 selinux-relabel
 install @server-product-environment
-firstboot-command useradd -m -p '' ejohn
-firstboot-command echo 'ejohn:weakpassword' | chpasswd
+firstboot-command useradd -m -p '' test
+firstboot-command echo 'test:weakpassword' | chpasswd