From 73102e877a87cff90bbdcf63bdd2478c32d221db Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 28 Oct 2022 09:11:12 -0700
Subject: [PATCH] Move some update params here from fedora_openqa schedule.py

We had code in fedora_openqa schedule.py to set some params for
update tests depending on the flavor. I don't remember why I
ever wrote it that way, but that's an odd way to do it, the
obvious way to do it is just to have them here, like we already
have several others and like we do it for composes. This will
help with https://progress.opensuse.org/issues/119200 because
the params set by fedora_openqa schedule.py go in the request
URI but ones set here don't.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 templates-updates.fif.json | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 7c4e9e84..e835604a 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -5,6 +5,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -15,6 +16,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -25,6 +27,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -45,6 +48,7 @@
             "distri": "fedora",
             "flavor": "updates-kde",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_kde_4_%ARCH%.qcow2",
                 "DESKTOP": "kde",
                 "NUMDISKS": "2",
                 "RETRY": "2"
@@ -56,6 +60,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -65,6 +70,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -74,6 +80,7 @@
             "distri": "fedora",
             "flavor": "updates-server-upgrade",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -104,6 +111,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
+                "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -118,21 +126,23 @@
                 "LIVE": "1",
                 "NUMDISKS": "2",
                 "PACKAGE_SET": "default",
-                "RETRY": "1"
+                "RETRY": "1",
+                "SUBVARIANT": "workstation"
             },
             "version": "*"
         },
         "fedora-updates-kde-live-iso-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
-	    "flavor": "updates-kde-live-iso",
+            "flavor": "updates-kde-live-iso",
             "settings": {
                 "DESKTOP": "kde",
                 "HDDSIZEGB": "15",
                 "LIVE": "1",
                 "NUMDISKS": "2",
                 "PACKAGE_SET": "default",
-                "RETRY": "1"
+                "RETRY": "1",
+                "SUBVARIANT": "kde"
             },
             "version": "*"
         },
@@ -153,6 +163,7 @@
             "flavor": "updates-workstation",
             "settings": {
                 "DESKTOP": "gnome",
+                "+HDD_1": "disk_f%VERSION%_desktop_4_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },