merge fedora 34

kvm-install-vm

@@ -91,6 +91,7 @@ function usage_subcommand ()
             printf "    ubuntu1604      Ubuntu 16.04 LTS (Xenial Xerus)     ubuntu\n"
             printf "    ubuntu1804      Ubuntu 18.04 LTS (Bionic Beaver)    ubuntu\n"
             printf "    ubuntu2004      Ubuntu 20.04 LTS (Focal Fossa)      ubuntu\n"
+            printf "    rocky8.5         Rocky Linux                         rocky\n"
             printf "\n"
             printf "EXAMPLES\n"
             printf "    $prog create foo\n"
@@ -474,6 +475,14 @@ function fetch_images ()
             DISK_FORMAT=qcow2
             LOGIN_USER=opensuse
             ;;
+       rocky85)
+            QCOW=Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+            OS_TYPE="linux"
+            OS_VARIANT="rocky8.5"
+            IMAGE_URL=https://dl.rockylinux.org/pub/rocky/8.5/images
+            DISK_FORMAT=qcow2
+            LOGIN_USER=rocky
+            ;;            
         *)
             die "${DISTRO} not a supported OS.  Run 'kvm-install-vm create help'."
             ;;
@@ -554,7 +563,7 @@ function storpool_exists ()
 function set_sudo_group ()
 {
     case "${DISTRO}" in
-        centos?|fedora??|*-atomic|amazon?|opensuse* )
+        centos*|fedora*|rocky*|*-atomic|amazon?|opensuse* )
             SUDOGROUP="wheel"
             ;;
         ubuntu*|debian* )
@@ -572,7 +581,7 @@ function set_cloud_init_remove ()
         centos6 )
             CLOUDINITDISABLE="chkconfig cloud-init off"
             ;;
-        centos9|centos8|centos7|amazon?|fedora??|ubuntu*|debian*|opensuse* )
+        centos9|centos8|centos7|amazon*|fedora*|rocky*|ubuntu*|debian*|opensuse* )
             CLOUDINITDISABLE="systemctl disable cloud-init.service"
             ;;
         *-atomic)

tests/check_distributions.bats

@@ -87,6 +87,21 @@ function remove_test_vm ()
 @test "Delete VM (Fedora 33) - $VMNAME-fedora33" {
     remove_test_vm fedora33
 }
+@test "Install VM (Fedora 34) - $VMNAME-fedora34" {
+    create_test_vm fedora34
+}
+
+@test "Delete VM (Fedora 34) - $VMNAME-fedora34" {
+    remove_test_vm fedora34
+}
+
+@test "Install VM (Fedora 35) - $VMNAME-fedora35" {
+    create_test_vm fedora34
+}
+
+@test "Delete VM (Fedora 35) - $VMNAME-fedora35" {
+    remove_test_vm fedora34
+}
 
 @test "Install VM (Ubuntu 16.04) - $VMNAME-ubuntu1604" {
     create_test_vm ubuntu1604