[PATCH V3] [Kimchi 0/7] Updates to support Fedora 24 and new distros
From: Paulo Vital <pvital@linux.vnet.ibm.com> V2 -> V3: - Updated remote links to Debian, OpenSUSE, Gentoo and Ubuntu - Updated test_rest.py to support changes in the distros info. V1 -> V2: - Fix missing "," V1: This patch-set adds support to recognize Fedora 24 ISO images and add new options for remote Fedora images. Paulo Vital (7): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. Update Debian remote images. Update Gentoo remote images. Update OpenSUSE remote images. Update Ubuntu remote images. Update unit tests to changes in Remote links. distros.d/debian.json | 6 ++--- distros.d/fedora.json | 57 ++++++++++++++++++++++++++++------------- distros.d/gentoo.json | 13 +++++++--- distros.d/opensuse.json | 7 ++++++ distros.d/ubuntu.json | 67 +++++++++++++++++++++++++++++++++++++------------ isoinfo.py | 1 + tests/test_rest.py | 10 ++++---- 7 files changed, 116 insertions(+), 45 deletions(-) -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Add new regex to also recognize Fedora 24 ISO images. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- isoinfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/isoinfo.py b/isoinfo.py index 7c000b7..d7ca044 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -119,6 +119,7 @@ iso_dir = [ ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), + ('fedora', lambda m: m.group(1), 'Fedora-[\w-]+-(\d+)'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Updated the links and options to Fedora remote ISO images: - Remove old x86_64 Fedora 20 and 21 as options - Added Fedora 23 and 24 for x86_64 - Remove old ppc64 Fedora 18, 19 and 20 as options - Added Fedora 22, 23 and 24 for ppc64 and ppc64le Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/fedora.json | 57 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/distros.d/fedora.json b/distros.d/fedora.json index 0ce0961..aa12b3f 100644 --- a/distros.d/fedora.json +++ b/distros.d/fedora.json @@ -1,44 +1,65 @@ [ { - "name": "Fedora 20", + "name": "Fedora 22", "os_distro": "fedora", "os_arch": "x86_64", - "os_version": "20", - "path": "http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/..." + "os_version": "22", + "path": "http://mirrors.kernel.org/fedora/releases/22/Live/x86_64/Fedora-Live-KDE-x86..." }, { - "name": "Fedora 21", + "name": "Fedora 23", "os_distro": "fedora", "os_arch": "x86_64", - "os_version": "21", - "path": "http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/Fedora-Live-KDE-x86..." + "os_version": "23", + "path": "http://mirrors.kernel.org/fedora/releases/23/Live/x86_64/Fedora-Live-KDE-x86..." }, { - "name": "Fedora 22", + "name": "Fedora 24", "os_distro": "fedora", "os_arch": "x86_64", - "os_version": "22", - "path": "http://mirrors.kernel.org/fedora/releases/22/Live/x86_64/Fedora-Live-KDE-x86..." + "os_version": "24", + "path": "http://mirrors.kernel.org/fedora/releases/24/Workstation/x86_64/iso/Fedora-W..." }, { - "name": "Fedora 18 (PPC64)", + "name": "Fedora 22", "os_distro": "fedora", "os_arch": "ppc64", - "os_version": "18", - "path": "http://mirrors.kernel.org/fedora-secondary/releases/18/Fedora/ppc64/iso/Fedo..." + "os_version": "22", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/22/Server/ppc64/iso/Fedo..." + }, + { + "name": "Fedora 22 LE", + "os_distro": "fedora", + "os_arch": "ppc64le", + "os_version": "22", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/22/Server/ppc64le/iso/Fe..." }, { - "name": "Fedora 19 (PPC64)", + "name": "Fedora 23", "os_distro": "fedora", "os_arch": "ppc64", - "os_version": "19", - "path": "http://mirrors.kernel.org/fedora-secondary/releases/19/Fedora/ppc64/iso/Fedo..." + "os_version": "23", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/23/Server/ppc64/iso/Fedo..." }, { - "name": "Fedora 20 (PPC64)", + "name": "Fedora 23 LE", + "os_distro": "fedora", + "os_arch": "ppc64le", + "os_version": "23", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/23/Server/ppc64le/iso/Fe..." + }, + { + "name": "Fedora 24", "os_distro": "fedora", "os_arch": "ppc64", - "os_version": "20", - "path": "http://mirrors.kernel.org/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedo..." + "os_version": "24", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/24/Server/ppc64/iso/Fedo..." + }, + { + "name": "Fedora 24 LE", + "os_distro": "fedora", + "os_arch": "ppc64le", + "os_version": "24", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/24/Server/ppc64le/iso/Fe..." } ] -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Updated the links to Debian stable remote ISO images. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/debian.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distros.d/debian.json b/distros.d/debian.json index 5d6a313..d81f751 100644 --- a/distros.d/debian.json +++ b/distros.d/debian.json @@ -1,9 +1,9 @@ [ { - "name": "debian-Wheezy", + "name": "Debian jessie", "os_distro": "debian", "os_arch": "x86_64", - "os_version": "7.7.0", - "path": "http://caesar.acc.umu.se/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-net..." + "os_version": "8.5", + "path": "http://ftp.acc.umu.se/debian-cd/8.5.0-live/amd64/iso-hybrid/debian-live-8.5...." } ] -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Updated the links to Gentoo remote ISO images. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/gentoo.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/distros.d/gentoo.json b/distros.d/gentoo.json index 2c0f012..487e3ab 100644 --- a/distros.d/gentoo.json +++ b/distros.d/gentoo.json @@ -1,9 +1,16 @@ [ { - "name": "gentoo-20141204", + "name": "gentoo-20140826", "os_distro": "gentoo", "os_arch": "x86_64", - "os_version": "20141204", - "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-am..." + "os_version": "20140826", + "path": "http://distfiles.gentoo.org/releases/amd64/20140826/livedvd-amd64-multilib-2..." + }, + { + "name": "gentoo-20160514", + "os_distro": "gentoo", + "os_arch": "x86_64", + "os_version": "20160514", + "path": "http://distfiles.gentoo.org/releases/amd64/20160514/livedvd-amd64-multilib-2..." } ] -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Updated the links to OpenSUSE remote ISO images. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/opensuse.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/distros.d/opensuse.json b/distros.d/opensuse.json index 7df2d86..5fb1f40 100644 --- a/distros.d/opensuse.json +++ b/distros.d/opensuse.json @@ -26,5 +26,12 @@ "os_arch": "x86_64", "os_version": "42.1", "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/leap/42.1/iso/openSUSE..." + }, + { + "name": "opensuse-42.2", + "os_distro": "opensuse", + "os_arch": "x86_64", + "os_version": "42.2", + "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/leap/42.2/iso/openSUSE..." } ] -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Updated the links to Ubuntu remote ISO images: - Removed 13.04 and 13.10 options - Updated 14.04 links - Added 15.05, 15.10 and 16.04 options Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/ubuntu.json | 67 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/distros.d/ubuntu.json b/distros.d/ubuntu.json index 161fbc8..8293112 100644 --- a/distros.d/ubuntu.json +++ b/distros.d/ubuntu.json @@ -1,37 +1,72 @@ [ { - "name": "Ubuntu 13.04 (Raring Ringtail)", + "name": "Ubuntu Server 14.04 LE (Trusty Tahr)", + "os_distro": "ubuntu", + "os_arch": "ppc64", + "os_version": "14.04", + "path": "http://cdimages.ubuntu.com/releases/14.04/release/ubuntu-14.04.4-server-ppc6..." + }, + { + "name": "Ubuntu Server 14.04 LE (Trusty Tahr)", "os_distro": "ubuntu", "os_arch": "x86_64", - "os_version": "13.04", - "path": "http://ubuntu-releases.cs.umn.edu/13.04/ubuntu-13.04-desktop-amd64.iso" + "os_version": "14.04", + "path": "http://ubuntu-releases.cs.umn.edu/14.04/ubuntu-14.04.4-server-amd64.iso" }, { - "name": "Ubuntu 13.10 (Saucy Salamander)", + "name": "Ubuntu Server 14.10 (Utopic Unicorn)", "os_distro": "ubuntu", "os_arch": "x86_64", - "os_version": "13.10", - "path": "http://ubuntu-releases.cs.umn.edu/13.10/ubuntu-13.10-desktop-amd64.iso" + "os_version": "14.10", + "path": "http://old-releases.ubuntu.com/releases/14.10/ubuntu-14.10-server-amd64.iso" }, { - "name": "Ubuntu Server 14.04 LE (Trusty Tahr)", + "name": "Ubuntu Server 14.10 LE (Utopic Unicorn)", "os_distro": "ubuntu", - "os_arch": "ppc64", - "os_version": "14.04", - "path": "http://cdimages.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-ppc64e..." + "os_arch": "ppc64le", + "os_version": "14.10", + "path": "http://old-releases.ubuntu.com/releases/14.10/ubuntu-14.10-server-ppc64el.is..." }, { - "name": "Ubuntu Server 14.04 LE (Trusty Tahr)", + "name": "Ubuntu Server 15.04 (Vivid Vervet)", "os_distro": "ubuntu", "os_arch": "x86_64", - "os_version": "14.04", - "path": "http://releases.ubuntu.com/14.04/ubuntu-14.04-desktop-amd64.iso" + "os_version": "15.04", + "path": "http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso" }, { - "name": "Ubuntu Server 14.10 (Utopic Unicorn)", + "name": "Ubuntu Server 15.04 LE (Vivid Vervet)", + "os_distro": "ubuntu", + "os_arch": "ppc64le", + "os_version": "15.04", + "path": "http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-ppc64le.is..." + }, + { + "name": "Ubuntu Server 15.10 (Wily Werewolf)", "os_distro": "ubuntu", "os_arch": "x86_64", - "os_version": "14.10", - "path": "http://releases.ubuntu.com/14.10/ubuntu-14.10-desktop-amd64.iso" + "os_version": "15.10", + "path": "http://releases.ubuntu.com/15.10/ubuntu-15.10-server-amd64.iso" + }, + { + "name": "Ubuntu Server 15.10 LE (Wily Werewolf)", + "os_distro": "ubuntu", + "os_arch": "ppc64le", + "os_version": "15.10", + "path": "http://cdimages.ubuntu.com/releases/15.10/release/ubuntu-15.10-server-ppc64e..." + }, + { + "name": "Ubuntu Server 16.04 (Xenial Xerus)", + "os_distro": "ubuntu", + "os_arch": "x86_64", + "os_version": "16.04", + "path": "http://releases.ubuntu.com/16.04/ubuntu-16.04-server-amd64.iso" + }, + { + "name": "Ubuntu Server 16.04 (Xenial Xerus)", + "os_distro": "ubuntu", + "os_arch": "ppc64le", + "os_version": "16.04", + "path": "http://cdimages.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-ppc64e..." } ] -- 2.5.5
From: Paulo Vital <pvital@linux.vnet.ibm.com> Modified the name of the remote Templates used in test_rest.py from Fedora 20 to Fedora 24. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- tests/test_rest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_rest.py b/tests/test_rest.py index 0cbcc0e..1a43411 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1342,14 +1342,14 @@ class RestTests(unittest.TestCase): self.assertIn('path', distro) # Test in X86 - ident = "Fedora 20" + ident = "Fedora 24" resp = self.request('/plugins/kimchi/config/distros/%s' % urllib2.quote(ident)).read() distro = json.loads(resp) if os.uname()[4] in ['x86_64', 'amd64']: self.assertEquals(distro['name'], ident) self.assertEquals(distro['os_distro'], "fedora") - self.assertEquals(distro['os_version'], "20") + self.assertEquals(distro['os_version'], "24") self.assertEquals(distro['os_arch'], "x86_64") self.assertIn('path', distro) else: @@ -1357,15 +1357,15 @@ class RestTests(unittest.TestCase): self.assertIn('KCHDISTRO0001E', distro.get('reason')) # Test in PPC - ident = "Fedora 20 (PPC64)" + ident = "Fedora 24 LE" resp = self.request('/plugins/kimchi/config/distros/%s' % urllib2.quote(ident)).read() distro = json.loads(resp) if os.uname()[4] == 'ppc64': self.assertEquals(distro['name'], ident) self.assertEquals(distro['os_distro'], "fedora") - self.assertEquals(distro['os_version'], "20") - self.assertEquals(distro['os_arch'], "ppc64") + self.assertEquals(distro['os_version'], "24") + self.assertEquals(distro['os_arch'], "ppc64le") self.assertIn('path', distro) else: # Distro not found error -- 2.5.5
Reviewed-By: Lucio Correia <luciojhc@linux.vnet.ibm.com> On 23-06-2016 14:11, pvital@linux.vnet.ibm.com wrote:
From: Paulo Vital <pvital@linux.vnet.ibm.com>
V2 -> V3: - Updated remote links to Debian, OpenSUSE, Gentoo and Ubuntu - Updated test_rest.py to support changes in the distros info.
V1 -> V2: - Fix missing ","
V1:
This patch-set adds support to recognize Fedora 24 ISO images and add new options for remote Fedora images.
Paulo Vital (7): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. Update Debian remote images. Update Gentoo remote images. Update OpenSUSE remote images. Update Ubuntu remote images. Update unit tests to changes in Remote links.
distros.d/debian.json | 6 ++--- distros.d/fedora.json | 57 ++++++++++++++++++++++++++++------------- distros.d/gentoo.json | 13 +++++++--- distros.d/opensuse.json | 7 ++++++ distros.d/ubuntu.json | 67 +++++++++++++++++++++++++++++++++++++------------ isoinfo.py | 1 + tests/test_rest.py | 10 ++++---- 7 files changed, 116 insertions(+), 45 deletions(-)
-- 2.5.5
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
-- Lucio Correia Software Engineer IBM LTC Brazil
participants (3)
-
Aline Manera -
Lucio Correia -
pvital＠linux.vnet.ibm.com