rpmostree_rebase: whoops. trimmed one line too many

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

lib/utils.pm

@@ -473,7 +473,6 @@ sub get_setup_repos_script {
 sub get_workarounds {
     my $version = shift || get_var("VERSION");
     my %workarounds = (
-        "39" => [],
         "40" => [],
         "41" => [],
         "42" => ["FEDORA-2024-3588cd5a27", "FEDORA-2024-1e10898d68"],
@@ -844,7 +843,8 @@ sub handle_welcome_screen {
 
 sub gnome_initial_setup {
     # Handle gnome-initial-setup, with variations for live mode (the
-    # short run on live boot since F39), the pre-login  mode (when no
+    # short run on live boot which was implemented at times from F39
+    # onwards, but currently isn't), the pre-login mode (when no
     # user was created during install) and post-login mode (when user
     # was created during install). post-login mode currently (2023-08)
     # unused, but may come back in future. 'livetry' indicates whether
@@ -961,24 +961,6 @@ sub gnome_initial_setup {
             wait_screen_change { assert_and_click ["next_button"]; };
         }
     }
-    unless (get_var("VNC_CLIENT") || $args{live} || $relnum > 39) {
-        # We should be at the GOA screen, except on VNC_CLIENT case
-        # where network isn't working yet. click 'Skip' one time. If
-        # it's not visible we may have hit
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1997310 , which
-        # we'll handle as a soft failure
-        # This screen was removed from g-i-s in Jan 2024:
-        # https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/221
-        # so we don't see it on F40+, and can drop this block when
-        # F39 is EOL
-        mouse_set(100, 100);
-        if (check_screen "skip_button", 60) {
-            wait_screen_change { click_lastmatch; };
-        }
-        else {
-            record_soft_failure "GOA screen not seen! Likely RHBZ #1997310";
-        }
-    }
     send_key "shift-tab" if ($args{live} && $args{livetry});
     # on the 'live' flow, this will launch the installer
     send_key "ret";

needles/gnome/apps/apps_menu_cheese-20210222.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "width": 19,
-      "xpos": 235,
-      "ypos": 264,
-      "height": 23
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "apps_menu_camera"
-  ]
-}

needles/gnome/apps/apps_run_cheese-20200117.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 41,
-      "width": 94,
-      "type": "match",
-      "height": 20,
-      "xpos": 279
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "apps_run_camera"
-  ]
-}

needles/kde/apps/kmag_runs-20220112.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 15,
-      "type": "match",
-      "ypos": 8,
-      "width": 72,
-      "xpos": 194
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kmag_runs"
-  ]
-}

needles/kde/apps/konversation_confirm_close-20220926.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 421,
-      "width": 54,
-      "type": "match",
-      "xpos": 533,
-      "height": 19
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "konversation_confirm_close"
-  ]
-}

needles/kde/apps/konversation_connect-20210929.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 370,
-      "type": "match",
-      "width": 13,
-      "xpos": 409,
-      "height": 19
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "konversation_connect"
-  ]
-}

needles/kde/apps/konversation_runs-20220916.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 114,
-      "width": 83,
-      "height": 15,
-      "xpos": 516
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "konversation_runs"
-  ]
-}

templates-updates.fif.json

@@ -391,7 +391,8 @@
                 "+START_AFTER_TEST": "live_build@%ARCH_BASE_MACHINE%",
                 "INSTALL": "1",
                 "ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso",
-                "QEMURAM": "4096"
+                "QEMURAM": "4096",
+                "RETRY": "5"
             }
         },
         "install_default_update_netinst": {

tests/_ostree_build.pm

@@ -83,8 +83,6 @@ sub run {
     assert_script_run 'git clone https://pagure.io/pungi-fedora.git';
     assert_script_run 'cd pungi-fedora/';
     assert_script_run "git checkout ${branch}";
-    # drop cheese flatpak on f39 as it has not been bumped to f41 base
-    assert_script_run 'sed -i -e "s,app/org.gnome.Cheese/[a-z_0-9]*/stable,,g" fedora.conf' if ($version eq "39");
     assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o ostree-parse-pungi.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/ostree-parse-pungi.py', timeout => 180;
     my $loraxargs = script_output "python3 ostree-parse-pungi.py $lcsubv $arch";
 

tests/applications/clocks/timer.pm

@@ -14,12 +14,6 @@ sub run {
     # Add a new alarm using the one minute button
     assert_screen("clocks_timer_page");
     assert_and_click("clocks_button_timer_minute");
-    # since GNOME 46, that was a 'quickstart', on older GNOME we
-    # have to hit start; remove this when no more F39 testing
-    if (check_screen("clocks_button_timer_start", 5)) {
-        wait_still_screen(2);
-        click_lastmatch;
-    }
     sleep(10);
     assert_and_click("clocks_button_timer_pause");
     assert_screen("clocks_timer_paused");

tests/apps_startstop/gnome/camera.pm

@@ -12,12 +12,10 @@ sub run {
 
     # Start the application
     start_with_launcher('apps_menu_camera');
-    # Check that is started or we see the camera access dialog
-    assert_screen ['apps_run_camera', 'grant_access'];
-    if (match_has_tag 'grant_access') {
-        click_lastmatch;
-        assert_screen 'apps_run_camera';
-    }
+    # Click the camera access dialog
+    assert_and_click 'grant_access';
+    # Check we see the app run
+    assert_screen 'apps_run_camera';
     # Register application
     register_application("gnome-snapshot");
     # Close the application

tests/apps_startstop/kde/konversation.pm

@@ -1,39 +0,0 @@
-use base "installedtest";
-use strict;
-use testapi;
-use utils;
-
-# This test checks that Konversation starts.
-
-sub run {
-    my $self = shift;
-    my $relnum = get_release_number;
-    # neochat replaced konversation in F40+; while we're still running
-    # this test on F39 the test has to handle both...
-    my $app = $relnum > 39 ? 'neochat' : 'konversation';
-
-    # Start the application
-    menu_launch_type $app;
-    # Connect to Freenode
-    assert_and_click "${app}_connect", timeout => 60 if ($app eq 'konversation');
-    # Check that it is started
-    assert_screen "${app}_runs";
-    # Close the application
-    if ($app eq 'konversation') {
-        send_key 'alt-f4';
-        wait_still_screen 2;
-        assert_and_click "${app}_confirm_close";
-    }
-    else {
-        quit_with_shortcut();
-    }
-}
-
-sub test_flags {
-    return {};
-}
-
-
-1;
-
-# vim: set sw=4 et:

tests/apps_startstop/kde/neochat.pm

@@ -3,18 +3,14 @@ use strict;
 use testapi;
 use utils;
 
-# This test checks that Kmag starts.
+# This test checks that Neochat starts.
 
 sub run {
     my $self = shift;
-    # FIXME after F39 is stable, drop this test entirely
-    my $relnum = get_release_number;
-    return unless ($relnum < 40);
-
     # Start the application
-    menu_launch_type 'kmag';
+    menu_launch_type 'neochat';
     # Check that it is started
-    assert_screen 'kmag_runs', timeout => 60;
+    assert_screen "neochat_runs";
     # Close the application
     quit_with_shortcut();
 }

tests/rpmostree_rebase.pm

@@ -45,9 +45,6 @@ sub run {
     elsif ($current =~ "silverblue") {
         my $relnum = get_release_number;
         $rebase = $relnum - 1;
-        # avoid rebasing 39 > 38 due to
-        # https://github.com/fedora-silverblue/issue-tracker/issues/470
-        $rebase = "40" if ($rebase eq "38");
         # on update tests, just rebase to the 'official' ref for the
         # release, as opposed to the custom ref we used when building;
         # this should be more reliable than a different release