Fix descriptions and update osinfo-db (#228)

* Fix descriptions for linux templates Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1852734 Signed-off-by: Andrej Krejcir <[email protected]> * Update osinfo-db to tag v20200813 This change adds EoL to Fedora Silverblue 30, and has the effect of removing this annotation: name.os.template.kubevirt.io/silverblue30: Fedora 31 or higher Travis CI distribution is chnged to Ubuntu 18.04, the old version could not build osinfo-db. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1852734 Signed-off-by: Andrej Krejcir <[email protected]>
kubevirt · Sep 25, 2020 · 3fe4c47 · 3fe4c47
1 parent 48b228a
commit 3fe4c47
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: xenial
+dist: bionic
 language: python
 branches:
   only:

diff --git a/osinfo-db b/osinfo-db
diff --git a/templates/fedora.tpl.yaml b/templates/fedora.tpl.yaml
@@ -9,9 +9,9 @@ metadata:
       Template for Fedora 31 VM or newer.
       A PVC with the Fedora disk image must be available.
 
-      Recommended disk image (needs to be converted to raw)
-      https://download.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2
-    tags: "hidden,kubevirt,virtualmachine,fedora,rhel"
+      Recommended disk image:
+      https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.qcow2
+    tags: "hidden,kubevirt,virtualmachine,fedora"
 
 {% include "_linux.yaml" %}
 
diff --git a/templates/opensuse.tpl.yaml b/templates/opensuse.tpl.yaml
@@ -9,7 +9,7 @@ metadata:
       Template for OpenSUSE Leap 15.0 VM.
       A PVC with the OpenSUSE disk image must be available.
 
-      Recommended disk image (needs to be converted to raw)
+      Recommended disk image:
       https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.0/images/
     tags: "hidden,kubevirt,virtualmachine,linux,opensuse"
 

diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml
@@ -9,7 +9,7 @@ metadata:
       Template for Ubuntu 18.04 (Xenial Xerus) VM.
       A PVC with the Ubuntu disk image must be available.
 
-      Recommended disk image (needs to be converted to raw)
+      Recommended disk image:
       http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
     tags: "hidden,kubevirt,virtualmachine,ubuntu"