diff --git a/kvm-install-vm b/kvm-install-vm index f316fe3..ea6d093 100755 --- a/kvm-install-vm +++ b/kvm-install-vm @@ -58,7 +58,7 @@ function usage_subcommand () printf " -l Location of Images (default: $HOME/virt/images)\n" printf " -L Location of VMs (default: $HOME/virt/vms)\n" printf " -m Memory Size (MB) (default: 1024)\n" - printf " -M mac Mac address (default: auto-assigned)\n" + printf " -M Mac address (default: auto-assigned)\n" printf " -p Console port (default: auto)\n" printf " -s Custom shell script\n" printf " -t Linux Distribution (default: centos7)\n" @@ -73,8 +73,6 @@ function usage_subcommand () printf " centos7-atomic CentOS 7 Atomic Host centos\n" printf " centos6 CentOS 6 centos\n" printf " debian9 Debian 9 (Stretch) debian\n" - printf " fedora26 Fedora 26 fedora\n" - printf " fedora26-atomic Fedora 26 Atomic Host fedora\n" printf " fedora27 Fedora 27 fedora\n" printf " fedora27-atomic Fedora 27 Atomic Host fedora\n" printf " fedora28 Fedora 28 fedora\n" @@ -259,18 +257,6 @@ function fetch_images () IMAGE_URL=https://cdimage.debian.org/cdimage/openstack/current-9 LOGIN_USER=debian ;; - fedora26) - QCOW=Fedora-Cloud-Base-26-1.5.x86_64.qcow2 - OS_VARIANT="fedora26" - IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/26/CloudImages/x86_64/images - LOGIN_USER=fedora - ;; - fedora26-atomic) - QCOW=Fedora-Atomic-26-20171003.0.x86_64.qcow2 - OS_VARIANT="fedora26" - IMAGE_URL=https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-26-20171003.0/CloudImages/x86_64/images - LOGIN_USER=fedora - ;; fedora27) QCOW=Fedora-Cloud-Base-27-1.6.x86_64.qcow2 OS_VARIANT="fedora27" diff --git a/tests/check_distributions.bats b/tests/check_distributions.bats index b9ac0f0..596b2bd 100644 --- a/tests/check_distributions.bats +++ b/tests/check_distributions.bats @@ -32,22 +32,6 @@ function remove_test_vm () remove_test_vm centos7-atomic } -@test "Install VM (Fedora 26 Atomic) - $VMNAME-fedora26-atomic" { - create_test_vm fedora26-atomic -} - -@test "Delete VM (Fedora 26 Atomic) - $VMNAME-fedora26-atomic" { - remove_test_vm fedora26-atomic -} - -@test "Install VM (Fedora 26) - $VMNAME-fedora26" { - create_test_vm fedora26 -} - -@test "Delete VM (Fedora 26) - $VMNAME-fedora26" { - remove_test_vm fedora26 -} - @test "Install VM (Fedora 27) - $VMNAME-fedora27" { create_test_vm fedora27 }