From 343ef8226b1809a94f44ae40009d0a1d8d54e9ab Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 6 Jul 2022 10:28:57 -0700
Subject: [PATCH] Use new RETRY variable handling to restart update tests on
 fail

Upstream recently implemented support for using the variable
RETRY to specify how many times a test should be restarted on
failure. This is something we currently handle with a downstream
openQA plugin; if we switch to using this upstream feature
instead, we can drop the plugin.

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

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 0a463733..74681e81 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -4,28 +4,36 @@
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "updates-container",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-container-ppc64le-*": {
             "arch": "ppc64le",
             "distri": "fedora",
             "flavor": "updates-container",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-container-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-container",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-everything-boot-iso-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-everything-boot-iso",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-kde-x86_64-*": {
@@ -33,7 +41,8 @@
             "distri": "fedora",
             "flavor": "updates-kde",
             "settings": {
-                "DESKTOP": "kde"
+                "DESKTOP": "kde",
+                "RETRY": "1"
             },
             "version": "*"
         },
@@ -41,42 +50,54 @@
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "updates-server",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-server-ppc64le-*": {
             "arch": "ppc64le",
             "distri": "fedora",
             "flavor": "updates-server",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-server-upgrade-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "updates-server-upgrade",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-server-upgrade-ppc64le-*": {
             "arch": "ppc64le",
             "distri": "fedora",
             "flavor": "updates-server-upgrade",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-server-upgrade-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-server-upgrade",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-server-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-server",
-            "settings": {},
+            "settings": {
+                "RETRY": "1"
+            },
             "version": "*"
         },
         "fedora-updates-workstation-live-iso-x86_64-*": {
@@ -87,7 +108,8 @@
                 "DESKTOP": "gnome",
                 "HDDSIZEGB": "15",
                 "LIVE": "1",
-                "PACKAGE_SET": "default"
+                "PACKAGE_SET": "default",
+                "RETRY": "1"
             },
             "version": "*"
         },
@@ -99,7 +121,8 @@
                 "DESKTOP": "kde",
                 "HDDSIZEGB": "15",
                 "LIVE": "1",
-                "PACKAGE_SET": "default"
+                "PACKAGE_SET": "default",
+                "RETRY": "1"
             },
             "version": "*"
         },
@@ -108,7 +131,8 @@
             "distri": "fedora",
             "flavor": "updates-workstation-upgrade",
             "settings": {
-                "DESKTOP": "gnome"
+                "DESKTOP": "gnome",
+                "RETRY": "1"
             },
             "version": "*"
         },
@@ -117,7 +141,8 @@
             "distri": "fedora",
             "flavor": "updates-workstation",
             "settings": {
-                "DESKTOP": "gnome"
+                "DESKTOP": "gnome",
+                "RETRY": "1"
             },
             "version": "*"
         }