Add support for Ubuntu 20.04 "Focal Fossa" (#58)

giovtorres · May 16, 2020 · ec4d27b · ec4d27b
1 parent 5d5668d
commit ec4d27b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ DISTRIBUTIONS
     opensuse15      OpenSUSE Leap 15.2                  opensuse
     ubuntu1604      Ubuntu 16.04 LTS (Xenial Xerus)     ubuntu
     ubuntu1804      Ubuntu 18.04 LTS (Bionic Beaver)    ubuntu
+    ubuntu2004      Ubuntu 20.04 LTS (Focal Fossa)      ubuntu
 
 EXAMPLES
     kvm-install-vm create foo

diff --git a/kvm-install-vm b/kvm-install-vm
@@ -84,6 +84,7 @@ function usage_subcommand ()
             printf "    opensuse15      OpenSUSE Leap 15.2                  opensuse\n"
             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 "\n"
             printf "EXAMPLES\n"
             printf "    $prog create foo\n"
@@ -402,6 +403,14 @@ function fetch_images ()
             DISK_FORMAT=qcow2
             LOGIN_USER=ubuntu
             ;;
+        ubuntu2004)
+            QCOW=ubuntu-20.04-server-cloudimg-amd64.img
+            OS_TYPE="linux"
+            OS_VARIANT="ubuntu20.04"
+            IMAGE_URL=https://cloud-images.ubuntu.com/releases/20.04/release
+            DISK_FORMAT=qcow2
+            LOGIN_USER=ubuntu
+            ;;
         opensuse15)
             QCOW=openSUSE-Leap-15.2-OpenStack.x86_64.qcow2
             OS_TYPE="linux"

diff --git a/tests/check_distributions.bats b/tests/check_distributions.bats
@@ -88,6 +88,14 @@ function remove_test_vm ()
     remove_test_vm ubuntu1804
 }
 
+@test "Install VM (Ubuntu 20.04) - $VMNAME-ubuntu2004" {
+    create_test_vm ubuntu2004
+}
+
+@test "Delete VM (Ubuntu 20.04) - $VMNAME-ubuntu2004" {
+    remove_test_vm ubuntu2004
+}
+
 @test "Install VM (Debian 9) - $VMNAME-debian9" {
     create_test_vm debian9
 }