Fix #2268505 workaround - move the actions push earlier

Oops, all other actions pushes need to happen *before* the reboot
action push, or the logic breaks.

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

lib/utils.pm

@@ -476,7 +476,7 @@ sub get_workarounds {
     my %workarounds = (
         "38" => [],
         "39" => [],
-        "40" => ["FEDORA-2024-b8e524ffdd"],
+        "40" => ["FEDORA-2024-01fd5aa621"],
         "41" => [],
     );
     my $advortasks = $workarounds{$version};

needles/firefox/firefox-nobookmarks-20240325.json

@@ -0,0 +1,23 @@
+{
+  "area": [
+    {
+      "width": 17,
+      "height": 18,
+      "ypos": 89,
+      "xpos": 88,
+      "type": "match"
+    },
+    {
+      "width": 17,
+      "xpos": 991,
+      "ypos": 88,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "firefox",
+    "browser"
+  ]
+}

needles/gnome/apps/clocks/clocks_alarm_snooze_confirmed-20240324.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 102,
+      "xpos": 231,
+      "ypos": 106,
+      "type": "match",
+      "height": 28
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "clocks_alarm_snooze_confirmed"
+  ]
+}

needles/gnome/apps/clocks/clocks_timer_page-20240324.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 87,
+      "xpos": 468,
+      "ypos": 367,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "clocks_timer_page"
+  ]
+}

needles/gnome/apps/maps/maps_button_zoom_in-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 24,
+      "ypos": 718,
+      "xpos": 974,
+      "width": 24
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_button_zoom_in"
+  ]
+}

needles/gnome/apps/maps/maps_button_zoom_out-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 22,
+      "type": "match",
+      "ypos": 718,
+      "xpos": 923,
+      "width": 19
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_button_zoom_out"
+  ]
+}

needles/gnome/apps/maps/maps_exported_map-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 389,
+      "height": 102,
+      "type": "match",
+      "xpos": 446,
+      "width": 141
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_exported_map"
+  ]
+}

needles/gnome/apps/maps/maps_found_brno-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 137,
+      "xpos": 443,
+      "type": "match",
+      "height": 117,
+      "ypos": 374
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_brno"
+  ]
+}

needles/gnome/apps/maps/maps_found_denali-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 146,
+      "xpos": 431,
+      "ypos": 389,
+      "height": 107,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_denali"
+  ]
+}

needles/gnome/apps/maps/maps_found_poysdorf-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 398,
+      "height": 129,
+      "type": "match",
+      "xpos": 453,
+      "width": 150
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_poysdorf"
+  ]
+}

needles/gnome/apps/maps/maps_found_pune-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 128,
+      "type": "match",
+      "ypos": 327,
+      "xpos": 374,
+      "width": 212
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_pune"
+  ]
+}

needles/gnome/apps/maps/maps_found_vilnius-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 140,
+      "type": "match",
+      "ypos": 371,
+      "xpos": 412,
+      "width": 192
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_vilnius"
+  ]
+}

needles/gnome/apps/maps/maps_found_wellington-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 119,
+      "ypos": 379,
+      "width": 198,
+      "xpos": 379
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_wellington"
+  ]
+}

needles/gnome/apps/maps/maps_info_vilnius-20240325.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 377,
+      "ypos": 191,
+      "width": 98,
+      "height": 60,
+      "type": "match"
+    },
+    {
+      "xpos": 456,
+      "ypos": 104,
+      "width": 52,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_info_vilnius"
+  ]
+}

needles/gnome/apps/maps/maps_info_wellington-20240325.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 91,
+      "ypos": 516,
+      "xpos": 468,
+      "width": 173
+    },
+    {
+      "width": 117,
+      "xpos": 374,
+      "ypos": 644,
+      "type": "match",
+      "height": 60
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_info_wellington"
+  ]
+}

needles/gnome/apps/maps/maps_map_zoomed-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 362,
+      "type": "match",
+      "height": 162,
+      "xpos": 415,
+      "width": 197
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_map_zoomed"
+  ]
+}

needles/gnome/apps/maps/maps_route_bike_shown-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 318,
+      "ypos": 354,
+      "width": 102,
+      "xpos": 347
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_bike_shown"
+  ]
+}

needles/gnome/apps/maps/maps_route_car_shown-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 371,
+      "height": 309,
+      "type": "match",
+      "xpos": 355,
+      "width": 80
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_car_shown"
+  ]
+}

needles/gnome/apps/maps/maps_route_walk_shown-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 417,
+      "height": 147,
+      "type": "match",
+      "width": 73,
+      "xpos": 319
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_walk_shown"
+  ]
+}

needles/gnome/apps/maps/maps_scale_on-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 11,
+      "width": 151,
+      "ypos": 720,
+      "type": "match",
+      "height": 38
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_scale_on"
+  ]
+}

needles/gnome/apps/sysmon/sysmon_processes_button-20240325.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 333,
+      "width": 20,
+      "ypos": 43,
+      "type": "match",
+      "height": 22
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "sysmon_processes_button"
+  ]
+}

needles/gnome/apps/sysmon/sysmon_resources_shown-20240325.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 78,
+      "width": 41,
+      "ypos": 206,
+      "height": 22,
+      "type": "match"
+    },
+    {
+      "type": "match",
+      "height": 21,
+      "ypos": 353,
+      "xpos": 113,
+      "width": 63
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "sysmon_resources_shown"
+  ]
+}

needles/gnome/desktop_update_notification_only-criticalupdates-gnome-20240324.json

@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "width": 89,
+      "xpos": 171,
+      "ypos": 58,
+      "height": 202,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_update_notification_only",
+    "desktop_update_notification",
+    "DESKTOP-gnome"
+  ]
+}

needles/gnome/gnome_button_toggle-inactive-20240324.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 53,
+      "xpos": 691,
+      "ypos": 114,
+      "type": "match",
+      "height": 37
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_button_toggle"
+  ]
+}

needles/gnome/grant_access-gnome-20240321.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 92,
+      "xpos": 589,
+      "ypos": 467,
+      "type": "match",
+      "height": 17
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "grant_access"
+  ]
+}

tests/_do_install_and_reboot.pm

@@ -125,11 +125,17 @@ sub run {
             push(@actions, 'noplymouth');
         }
     }
+    if (get_var("CANNED") && get_var("UEFI")) {
+        push(@actions, 'checkefibootmgr') if (get_var("UEFI"));
+    }
     # memcheck test doesn't need to reboot at all. Rebooting from GUI
     # for no-webUI lives is unreliable (webUI lives reboot on "Quit"
     # just like non-lives). And if we're already doing something
     # else at a console, we may as well reboot from there too
     push(@actions, 'reboot') if (!get_var("MEMCHECK") && ((get_var("LIVE") && !$webui) || @actions));
+    # check whether install is affected by
+    # https://bugzilla.redhat.com/show_bug.cgi?id=2268505 ,
+    # soft fail and work around it if so
     # our approach for taking all these actions doesn't work on VNC
     # installs, fortunately we don't need any of them in that case
     # yet, so for now let's just flush the list here if we're VNC
@@ -191,6 +197,16 @@ sub run {
     if (grep { $_ eq 'noplymouth' } @actions) {
         assert_script_run "chroot $mount dnf -y remove plymouth";
     }
+    if (grep { $_ eq 'checkefibootmgr' } @actions) {
+        if (script_run 'efibootmgr | grep fedora') {
+            record_soft_failure "No EFI boot manager entry created - likely RHBZ #2268505";
+            # delete the optical drive entry, if there is one, so hopefully
+            # we'll boot via fallback path
+            unless (script_run 'efibootmgr | grep CD-ROM') {
+                assert_script_run('efibootmgr -b $(efibootmgr | grep CD-ROM | head -1 | cut -f1 | sed -e "s,[^0-9],,g") -B');
+            }
+        }
+    }
     type_string "reboot\n" if (grep { $_ eq 'reboot' } @actions);
 }
 

tests/applications/clocks/alarm.pm

@@ -30,14 +30,25 @@ sub run {
     # After another minute or so, the alarm should ring again.
     # This time we will use the stop button to stop it.
     assert_and_click("clocks_button_alarm_stop", timeout => 120);
-    # The alarm should switch off but should stay listed active.
-    assert_screen("clocks_alarm_active");
-    # Now toggle the switch to inactivate it.
+    # Up to 46.0, the alarm would stay active after being stopped; from
+    # 46.0 onwards it goes inactive. FIXME this can be simplified to
+    # assume it starts at 'inactive' once we are no longer testing
+    # < 46.0 anywhere
+    assert_screen(["clocks_alarm_active", "clocks_alarm_inactive"]);
+    my $wasactive = match_has_tag("clocks_alarm_active");
+    # Now toggle the switch to change its state
     assert_and_click("gnome_button_toggle");
-    assert_screen("clocks_alarm_inactive");
+    # whichever state it was in, check it's now in the other
+    if ($wasactive) {
+        assert_screen("clocks_alarm_inactive");
+    }
+    else {
+        assert_screen("clocks_alarm_active");
+    }
     # Delete alarm using the delete button.
     assert_and_click("gnome_button_cross_remove");
-    if (check_screen("clocks_alarm_inactive")) {
+    sleep 2;
+    if (check_screen(["clocks_alarm_active", "clocks_alarm_inactive"])) {
         die("The alarm should have been deleted but it is still visible in the GUI");
     }