From 9608e7945bd6f3d348e75a64a5fcd06dfa19e463 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 29 Nov 2024 23:37:29 -0800
Subject: [PATCH] Add a workaround for #2329587, drop retry count again

This workaround is tested on stg and seems to work. If we see the
grey screen, go to a console and reboot from there. Don't do this
on any other test as it might interfere with bootloader param
entry.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 .../anaconda_grey_stuck-20241130.json            |  15 +++++++++++++++
 .../anaconda_grey_stuck-20241130.png             | Bin 0 -> 190 bytes
 templates-updates.fif.json                       |   1 -
 tests/_do_install_and_reboot.pm                  |   8 ++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 needles/anaconda/install_process/anaconda_grey_stuck-20241130.json
 create mode 100644 needles/anaconda/install_process/anaconda_grey_stuck-20241130.png

diff --git a/needles/anaconda/install_process/anaconda_grey_stuck-20241130.json b/needles/anaconda/install_process/anaconda_grey_stuck-20241130.json
new file mode 100644
index 00000000..7d178232
--- /dev/null
+++ b/needles/anaconda/install_process/anaconda_grey_stuck-20241130.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 9,
+      "ypos": 9,
+      "width": 1003,
+      "height": 745,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_grey_stuck"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/anaconda_grey_stuck-20241130.png b/needles/anaconda/install_process/anaconda_grey_stuck-20241130.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3427167e08650b66ca283dfff4794274812cbfb
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j85o&?R6|L-ABY#=6XM#?&@iFI))2@o^K@|x
tk&t|QkdYC{Yg+JceVNArAd8lup_;LopMjBS#vEOcHJ+}1F6*2UngF|I7KQ)-

literal 0
HcmV?d00001

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index e8cb1f22..cdc24b58 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -399,7 +399,6 @@
                 "NO_ADVISORY_POST": "1",
                 "PACKAGE_SET": "default",
                 "PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
-                "RETRY": "5",
                 "WORKER_CLASS": "tap"
             }
         },
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 29510c2b..3dd6a470 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -145,6 +145,14 @@ sub run {
     unless (@actions) {
         unless (get_var("MEMCHECK")) {
             assert_and_click "anaconda_install_done";
+            if (get_var("TEST") eq 'install_default_update_netinst') {
+                wait_still_screen 10;
+                if (check_screen "anaconda_grey_stuck") {
+                    record_soft_failure 'looks like anaconda shutdown stuck - https://bugzilla.redhat.com/show_bug.cgi?id=2329587';
+                    $self->root_console(timeout => 30);
+                    type_string "reboot\n";
+                }
+            }
         }
         return undef;
     }