From d069cbe42b61d07eb63ef5c1a21e523c1e802d7e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mar 06 2018 23:57:10 +0000
Subject: Update image config for renamed Atomic variants


The 'Atomic' variant was renamed 'AtomicHost', and 'Workstation
Ostree' was renamed 'AtomicWorkstation'. We need to adjust a
bunch of stuff for this, including the scheduler's list of images
to schedule jobs for.

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

---

diff --git a/fedora_openqa/config.py b/fedora_openqa/config.py
index 1b1fb0e..32c3276 100644
--- a/fedora_openqa/config.py
+++ b/fedora_openqa/config.py
@@ -191,6 +191,9 @@ WANTED = [
         },
         "dkboot": True,
     },
+    # 'Atomic' subvariant was renamed to 'AtomicHost' from F28 onward,
+    # when there are no more F28 images being produced, we can drop
+    # this here and elsewhere
     {
         "match": {
             "subvariant": "Atomic",
@@ -201,7 +204,15 @@ WANTED = [
     },
     {
         "match": {
-            "subvariant": "Workstation Ostree",
+            "subvariant": "AtomicHost",
+            "type": "dvd-ostree",
+            "format": "iso",
+            "arch": "x86_64",
+        },
+    },
+    {
+        "match": {
+            "subvariant": "AtomicWorkstation",
             "type": "dvd-ostree",
             "format": "iso",
             "arch": "x86_64",
diff --git a/images.json.sample b/images.json.sample
index 2317a20..df211f7 100644
--- a/images.json.sample
+++ b/images.json.sample
@@ -151,7 +151,15 @@
     },
     {
         "match": {
-            "subvariant": "Workstation Ostree",
+            "subvariant": "AtomicHost",
+            "type": "dvd-ostree",
+            "format": "iso",
+            "arch": "x86_64"
+        }
+    },
+    {
+        "match": {
+            "subvariant": "AtomicWorkstation",
             "type": "dvd-ostree",
             "format": "iso",
             "arch": "x86_64"
@@ -185,6 +193,14 @@
     },
     {
         "match": {
+            "subvariant": "AtomicHost",
+            "type": "dvd-ostree",
+            "format": "iso",
+            "arch": "ppc64le"
+        }
+    },
+    {
+        "match": {
             "subvariant": "Server",
             "type": "boot",
             "format": "iso",
@@ -209,4 +225,12 @@
             "arch": "ppc64"
         }
     }
+    {
+        "match": {
+            "subvariant": "AtomicHost",
+            "type": "dvd-ostree",
+            "format": "iso",
+            "arch": "ppc64"
+        }
+    }
 ]