Revert "D'oh, move the most important encryption test to BIOS"

This reverts commit 508635ed1c and
the fix-up follow-up, because this causes the test to have a
different scenario which screws up gating. Argh. I guess we're
stuck restarting it forever. Let's bump the retry number even
higher instead.

templates-updates.fif.json

@@ -258,8 +258,8 @@
             "machine": "bios",
             "product": "fedora-updates-workstation-live-iso-x86_64-*"
         },
-        "fedora-updates-workstation-upgrade-x86_64-*-bios": {
-            "machine": "bios",
+        "fedora-updates-workstation-upgrade-x86_64-*-64bit": {
+            "machine": "64bit",
             "product": "fedora-updates-workstation-upgrade-x86_64-*"
         },
         "fedora-updates-workstation-x86_64-*-64bit": {
@@ -627,7 +627,7 @@
         },
         "upgrade_desktop_encrypted_64bit": {
             "profiles": {
-                "fedora-updates-workstation-upgrade-x86_64-*-bios": 5
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
             }
         },
         "upgrade_realmd_client": {

templates.fif.json

@@ -3086,7 +3086,7 @@
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
-                "RETRY": "2",
+                "RETRY": "4",
                 "ROOT_PASSWORD": "weakpassword",
                 "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",