Browse Source

Update OS Images (#32)

* Add updated Fedora OS and Amazon Linux 2 images
* Update tests
pull/33/head
PegasusPrime 7 years ago committed by Giovanni Torres
parent
commit
52bb752ecb
  1. 47
      kvm-install-vm
  2. 20
      tests/check_distributions.bats

47
kvm-install-vm

@ -73,10 +73,9 @@ 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 " fedora27 Fedora 27 fedora\n"
printf " fedora27-atomic Fedora 27 Atomic Host fedora\n"
printf " fedora28 Fedora 28 fedora\n"
printf " fedora28-atomic Fedora 28 Atomic Host fedora\n"
printf " fedora29 Fedora 29 fedora\n"
printf " fedora29-atomic Fedora 29 Atomic Host fedora\n"
printf " fedora30 Fedora 30 fedora\n"
printf " ubuntu1604 Ubuntu 16.04 LTS (Xenial Xerus) ubuntu\n"
printf " ubuntu1804 Ubuntu 18.04 LTS (Bionic Beaver) ubuntu\n"
printf "\n"
@ -222,9 +221,9 @@ function fetch_images ()
# Use the command "osinfo-query os" to get the list of the accepted OS variants.
case "$DISTRO" in
amazon2)
QCOW=amzn2-kvm-2.0.20181114-x86_64.xfs.gpt.qcow2
QCOW=amzn2-kvm-2.0.20190313-x86_64.xfs.gpt.qcow2
OS_VARIANT="auto"
IMAGE_URL=https://cdn.amazonlinux.com/os-images/2.0.20181114/kvm
IMAGE_URL=https://cdn.amazonlinux.com/os-images/2.0.20190313/kvm
LOGIN_USER=ec2-user
;;
centos7)
@ -258,28 +257,22 @@ function fetch_images ()
IMAGE_URL=https://cdimage.debian.org/cdimage/openstack/current-9
LOGIN_USER=debian
;;
fedora27)
QCOW=Fedora-Cloud-Base-27-1.6.x86_64.qcow2
OS_VARIANT="fedora27"
IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/27/CloudImages/x86_64/images
LOGIN_USER=fedora
;;
fedora27-atomic)
QCOW=Fedora-Atomic-27-1.6.x86_64.qcow2
OS_VARIANT="fedora27"
IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/27/CloudImages/x86_64/images
LOGIN_USER=fedora
;;
fedora28)
QCOW=Fedora-Cloud-Base-28-1.1.x86_64.qcow2
OS_VARIANT="fedora27"
IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/x86_64/images
fedora29)
QCOW=Fedora-Cloud-Base-29-1.2.x86_64.qcow2
OS_VARIANT="fedora29"
IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images
LOGIN_USER=fedora
;;
fedora29-atomic)
QCOW=Fedora-AtomicHost-29-20190611.0.x86_64.qcow2
OS_VARIANT="fedora29"
IMAGE_URL=https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-29-updates-20190611.0/AtomicHost/x86_64/images/
LOGIN_USER=fedora
;;
fedora28-atomic)
QCOW=Fedora-AtomicHost-28-20180425.0.x86_64.qcow2
OS_VARIANT="fedora27"
IMAGE_URL=https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-28-20180425.0/AtomicHost/x86_64/images
fedora30)
QCOW=Fedora-Cloud-Base-30-1.2.x86_64.qcow2
OS_VARIANT="fedora29"
IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images
LOGIN_USER=fedora
;;
ubuntu1604)
@ -290,7 +283,7 @@ function fetch_images ()
;;
ubuntu1804)
QCOW=ubuntu-18.04-server-cloudimg-amd64.img
OS_VARIANT="ubuntu17.10"
OS_VARIANT="ubuntu18.04"
IMAGE_URL=https://cloud-images.ubuntu.com/releases/18.04/release
LOGIN_USER=ubuntu
;;

20
tests/check_distributions.bats

@ -32,38 +32,30 @@ function remove_test_vm ()
remove_test_vm centos7-atomic
}
@test "Install VM (Fedora 27) - $VMNAME-fedora27" {
@test "Install VM (Fedora 29) - $VMNAME-fedora29" {
create_test_vm fedora27
}
@test "Delete VM (Fedora 27) - $VMNAME-fedora27" {
@test "Delete VM (Fedora 29) - $VMNAME-fedora29" {
remove_test_vm fedora27
}
@test "Install VM (Fedora 27 Atomic) - $VMNAME-fedora27-atomic" {
@test "Install VM (Fedora 29 Atomic) - $VMNAME-fedora29-atomic" {
create_test_vm fedora27-atomic
}
@test "Delete VM (Fedora 27 Atomic) - $VMNAME-fedora27-atomic" {
@test "Delete VM (Fedora 29 Atomic) - $VMNAME-fedora29-atomic" {
remove_test_vm fedora27-atomic
}
@test "Install VM (Fedora 28) - $VMNAME-fedora28" {
@test "Install VM (Fedora 30) - $VMNAME-fedora30" {
create_test_vm fedora28
}
@test "Delete VM (Fedora 28) - $VMNAME-fedora28" {
@test "Delete VM (Fedora 30) - $VMNAME-fedora30" {
remove_test_vm fedora28
}
@test "Install VM (Fedora 28 Atomic) - $VMNAME-fedora28-atomic" {
create_test_vm fedora28-atomic
}
@test "Delete VM (Fedora 28 Atomic) - $VMNAME-fedora28-atomic" {
remove_test_vm fedora28-atomic
}
@test "Install VM (Ubuntu 16.04) - $VMNAME-ubuntu1604" {
create_test_vm ubuntu1604
}

Loading…
Cancel
Save