From e0da54df72140a14f9574a0c3e97f1cf2a67e366 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jul 17 2018 23:37:14 +0000
Subject: Adjust result reporting for removal of server roles


Test matrix and cases have been rejigged a bit, update this to
match.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora_openqa/conf_test_suites.py b/fedora_openqa/conf_test_suites.py
index 66c8ba4..38b9494 100644
--- a/fedora_openqa/conf_test_suites.py
+++ b/fedora_openqa/conf_test_suites.py
@@ -38,7 +38,6 @@ TESTCASES = {
     #   $IMAGETYPE$         - pungi 'type': "boot", "live"... "boot" -> "netinst"
     #   $FS$                - filesystem: "ext3", "btrfs"... expected to be last element of openQA test name
     #   $DESKTOP$           - desktop: just the DESKTOP openQA setting
-    #   $ROLE$              - server role, for role_deploy_ tests: "domain_controller", "database_server"
 
     "QA:Testcase_Boot_default_install": {
         "name": "$SUBVARIANT$_$IMAGETYPE$",
@@ -360,10 +359,17 @@ TESTCASES = {
         "env": "$RUNARCH$",
         "type": "Server",
     },
-    "QA:Testcase_Server_role_deploy": {
+    "QA:Testcase_freeipa_trust_server_installation": {
+        "env": "$RUNARCH$",
+        "type": "Server",
+    },
+    "QA:Testcase_freeipa_trust_server_uninstallation": {
+        "env": "$RUNARCH$",
+        "type": "Server",
+    },
+    "QA:Testcase_postgresql_server_installation": {
         "env": "$RUNARCH$",
         "type": "Server",
-        "name": "$ROLE$",
     },
     "QA:Testcase_realmd_join_kickstart": {
         # the section name here is pretty funky and I might change it,
@@ -853,7 +859,8 @@ TESTSUITES = {
         "QA:Testcase_kickstart_firewall_configured",
     ],
     "server_role_deploy_domain_controller": [
-        "QA:Testcase_Server_role_deploy",
+        "QA:Testcase_freeipa_trust_server_installation",
+        "QA:Testcase_freeipa_trust_server_uninstallation",
     ],
     "server_realmd_join_kickstart": [
         "QA:Testcase_realmd_join_kickstart",
@@ -898,7 +905,7 @@ TESTSUITES = {
         "QA:Testcase_Server_filesystem_default",
     ],
     "server_role_deploy_database_server": [
-        "QA:Testcase_Server_role_deploy",
+        "QA:Testcase_postgresql_server_installation",
     ],
     "server_database_client": [
         "QA:Testcase_database_server_remote_client",
diff --git a/fedora_openqa/report.py b/fedora_openqa/report.py
index 14639d0..a176840 100644
--- a/fedora_openqa/report.py
+++ b/fedora_openqa/report.py
@@ -75,10 +75,6 @@ def _uniqueres_replacements(job, tcdict):
         firmware = 'BIOS'
         bootmethod = 'x86_64 BIOS'
 
-    role = ''
-    if 'role_deploy_' in job['test']:
-        role = job['test'].split('role_deploy_')[1]
-
     # We effectively deep copy the `tcdict` dict here; if we just modified it directly
     # we'd actually be changing it in TESTCASES, so the results for later jobs in this run
     # with the same testcase (but a different environment, section or testname) would read
@@ -93,7 +89,6 @@ def _uniqueres_replacements(job, tcdict):
         value = value.replace('$IMAGETYPE$', imagetype)
         value = value.replace('$DESKTOP$', desktop)
         value = value.replace('$SUBVARIANT_OR_ARM$', subvariant_or_arm)
-        value = value.replace('$ROLE$', role)
         changed[key] = value
 
     return changed
diff --git a/tests/test_report.py b/tests/test_report.py
index 6d3bb57..f5fbafb 100644
--- a/tests/test_report.py
+++ b/tests/test_report.py
@@ -51,7 +51,6 @@ def test_uniqueres_replacements(jobdict01):
         "imagetype": "$IMAGETYPE$",
         "fs": "$FS$",
         "desktop": "$DESKTOP$",
-        "role": "$ROLE$",
     }
     origbase = copy.deepcopy(basedict)
     ret = fosreport._uniqueres_replacements(jobdict01, basedict)
@@ -63,7 +62,6 @@ def test_uniqueres_replacements(jobdict01):
     assert ret['imagetype'] == "dvd"
     # shouldn't crash, or anything
     assert ret['desktop'] == ''
-    assert ret['role'] == ''
     # basedict should not be modified
     assert basedict == origbase
 
@@ -82,11 +80,6 @@ def test_uniqueres_replacements(jobdict01):
         ret = fosreport._uniqueres_replacements(jobdict01, basedict)
     assert ret['bootmethod'] == 'x86_64 UEFI'
 
-    # sensible value for 'role' check
-    with mock.patch.dict(jobdict01, {'test': 'role_deploy_domain_controller'}):
-        ret = fosreport._uniqueres_replacements(jobdict01, basedict)
-    assert ret['role'] == 'domain_controller'
-
     # check Cloud_Base is turned into Cloud for this case
     with mock.patch.dict(jobdict01['settings'], {'SUBVARIANT': 'Cloud_Base'}):
         ret = fosreport._uniqueres_replacements(jobdict01, basedict)