main.pm

@@ -352,8 +352,11 @@ sub load_postinstall_tests() {
     }
 
     # load the ADVISORY / KOJITASK post-install test - this records which
-    # update or task packages were actually installed during the test.
+    # update or task packages were actually installed during the test. Don't
-    if (get_var("ADVISORY_OR_TASK") && !get_var("NO_ADVISORY_POST")) {
+    # do this for netinst tests; as these just use the default install repo,
+    # they will not get the packages from the update. But installs from live
+    # image and ostree installer image should get them.
+    if (get_var("ADVISORY_OR_TASK") && get_var("TEST") ne "install_default_update_netinst") {
         # don't do this for support server unless the update is for the same
         # release as the support server disk image, as we don't install the
         # updates on support server when they differ

needles/gnome/apps/keyring/keyring_askpass_password-gnome.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 226,
+      "ypos": 271,
+      "width": 164,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_askpass_password"
+  ]
+}

needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 21,
-      "width": 170,
-      "ypos": 240,
-      "xpos": 550,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_askpass_yesno"
-  ]
-}

needles/gnome/apps/nautilus/nautilus_autounlock_password.json

@@ -10,8 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_autounlock_password",
+    "nautilus_autounlock_password"
-    "keyring_askpass_remember",
-    "DESKTOP-gnome"
   ]
 }

needles/gnome/apps/nautilus/nautilus_remember_password.json

@@ -10,8 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_remember_password",
+    "nautilus_remember_password"
-    "keyring_askpass_remember",
-    "DESKTOP-gnome"
   ]
 }

needles/gnome/apps/nautilus/nautilus_unlock-20240514.json

@@ -10,8 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock",
+    "nautilus_unlock"
-    "keyring_askpass_confirm",
-    "DESKTOP-gnome"
   ]
 }

needles/gnome/apps/nautilus/nautilus_unlock.json

@@ -10,8 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock",
+    "nautilus_unlock"
-    "keyring_askpass_confirm",
-    "DESKTOP-gnome"
   ]
 }

needles/kde/apps/keyring/keyring_askpass_confirm.json

@@ -10,7 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_confirm",
+    "keyring_askpass_confirm"
-    "DESKTOP-kde"
   ]
 }

needles/kde/apps/keyring/keyring_askpass_password.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 379,
+      "ypos": 322,
+      "width": 167,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_askpass_password"
+  ]
+}

needles/kde/apps/keyring/keyring_askpass_remember.json

@@ -10,7 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_remember",
+    "keyring_askpass_remember"
-    "DESKTOP-kde"
   ]
 }

needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json

@@ -10,7 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno",
+    "keyring_askpass_yesno"
-    "DESKTOP-kde"
   ]
 }

needles/kde/apps/keyring/keyring_askpass_yesno.json

@@ -11,7 +11,6 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno",
+    "keyring_askpass_yesno"
-    "DESKTOP-kde"
   ]
 }

needles/kde/apps/keyring/keyring_wallet_password_reveal-f39-20241005.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "width": 95,
-      "ypos": 231,
-      "xpos": 484,
-      "height": 19
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_wallet_password_reveal"
-  ]
-}

needles/kde/apps/kwalletmanager_runs-f39-20241005.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 97,
-      "xpos": 460,
-      "width": 104,
-      "height": 23
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kwalletmanager_runs"
-  ]
-}

needles/kde/printing_check_sentence-20241005-alt.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 219,
-      "ypos": 136,
-      "width": 305,
-      "type": "match",
-      "height": 18
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "printing_check_sentence"
-  ]
-}

templates-updates.fif.json

@@ -351,24 +351,12 @@
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
-        "desktop_keyring": {
-            "profiles": {
-                "fedora-updates-kde-x86_64-*-64bit": 5,
-                "fedora-updates-workstation-x86_64-*-64bit": 5
-            }
-        },
         "desktop_printing": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
-        "desktop_printing_builtin": {
-            "profiles": {
-                "fedora-updates-kde-x86_64-*-64bit": 5,
-                "fedora-updates-workstation-x86_64-*-64bit": 5
-            }
-        },
         "desktop_terminal": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
@@ -407,7 +395,6 @@
                 "INSTALL_UNLOCK": "support_ready",
                 "ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso",
                 "NICTYPE": "tap",
-                "NO_ADVISORY_POST": "1",
                 "PACKAGE_SET": "default",
                 "PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
                 "WORKER_CLASS": "tap"
@@ -614,11 +601,6 @@
                 "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5
             }
         },
-        "toolbox": {
-            "profiles": {
-                "fedora-updates-workstation-x86_64-*-64bit": 5
-            }
-        },
         "upgrade_desktop_encrypted_64bit": {
             "profiles": {
                 "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5

templates.fif.json

@@ -964,8 +964,6 @@
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
-                "NO_ADVISORY_POST": "1",
-                "NO_UEFI_POST": "1",
                 "POSTINSTALL": "desktop_login",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }

tests/applications/keyring/keyring_password.pm

@@ -46,10 +46,10 @@ sub connect_localhost {
         # in the password. We will also try to remember the
         # password and confirm the connection.
         if ($type ne "reconnect") {
-            assert_screen("keyring_askpass_remember");
+            wait_still_screen(3);
             type_very_safely($pass);
-            click_lastmatch;
+            assert_and_click("nautilus_remember_password");
-            assert_and_click("keyring_askpass_confirm");
+            assert_and_click("nautilus_unlock");
         }
         # When the connection has been established,
         # a new connection icon will appear.
@@ -83,9 +83,9 @@ sub connect_localhost {
             # Then similarly to Gnome, the password dialogue will appear
             # and we type in the password. Also, we click on Remember
             # and confirm with the OK button.
-            assert_screen("keyring_askpass_remember");
+            assert_screen("keyring_askpass_password");
             type_very_safely("$pass");
-            click_lastmatch;
+            assert_and_click("keyring_askpass_remember");
             assert_and_click("keyring_askpass_confirm");
         }
         # Check that we have logged in and exit the application.
@@ -154,7 +154,7 @@ sub run {
     # Boot to login screen and type in the password.
     boot_to_login_screen();
     dm_perform_login($desktop, $pass);
-    check_desktop(timeout => 120);
+    check_desktop;
 
     # Repeat the connection procedure, but skip the password
     # handling process as this will be done by the keyring.

tests/applications/keyring/keyring_passwordless.pm

@@ -46,16 +46,25 @@ sub connect_localhost {
     # the SSH key.
     my $command = "sftp $user" . '@localhost';
     enter_cmd($command);
+    sleep 2;
 
     # When connecting for the first time, we will remember
     # the key password and store it in the keyring.
     if ($type ne "reconnect") {
-        assert_screen("keyring_askpass_yesno");
+        if ($desktop eq "gnome") {
-        type_very_safely("yes\n");
+            type_very_safely("yes\n");
-        assert_screen("keyring_askpass_remember");
+            wait_still_screen(2);
-        type_very_safely("sshpassword");
+            type_very_safely("sshpassword");
-        click_lastmatch;
+            assert_and_click("nautilus_autounlock_password");
-        assert_and_click("keyring_askpass_confirm");
+            assert_and_click("nautilus_unlock");
+        }
+        else {
+            type_very_safely("yes\n");
+            wait_still_screen(2);
+            type_very_safely("sshpassword");
+            assert_and_click("keyring_askpass_remember");
+            assert_and_click("keyring_askpass_confirm");
+        }
     }
 
     # The connection should have been established if everything has worked
@@ -96,7 +105,7 @@ sub run {
     # Log in.
     boot_to_login_screen();
     dm_perform_login($desktop, $pass);
-    check_desktop(timeout => 120);
+    check_desktop;
 
     # Reconnect without using password. We still should be
     # able to log in.