Add several more tests to the desktop update test set

There's no obvious reason we're not also running these tests on
updates, so let's do it. We have to skip the advisory and UEFI
post checks for desktop_login as the last step of that test is
shutting down the system.

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

main.pm

@@ -352,11 +352,8 @@ sub load_postinstall_tests() {
     }
 
     # load the ADVISORY / KOJITASK post-install test - this records which
-    # update or task packages were actually installed during the test. Don't
-    # 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") {
+    # update or task packages were actually installed during the test.
+    if (get_var("ADVISORY_OR_TASK") && !get_var("NO_ADVISORY_POST")) {
         # 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

templates-updates.fif.json

@@ -351,12 +351,30 @@
                 "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_login": {
+            "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,
@@ -395,6 +413,7 @@
                 "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"
@@ -601,6 +620,11 @@
                 "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,6 +964,8 @@
             "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%"
             }