[PATCH V2] [Kimchi 0/2] Updates to support Fedora 24
From: Paulo Vital <pvital@linux.vnet.ibm.com> V1 -> V2: - Fix missing "," V1: This patch-set adds support to recognize Fedora 24 ISO images and add new optins for remote Fedora images. Paulo Vital (2): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. distros.d/fedora.json | 32 +++++++++++++++++++++++--------- isoinfo.py | 1 + 2 files changed, 24 insertions(+), 9 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 Fedora 20 and 21 as options - Added Fedora 23 and 24 for x86_64 - Added Fedora 23 for ppc64 and ppc64le Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- distros.d/fedora.json | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/distros.d/fedora.json b/distros.d/fedora.json index 0ce0961..a38f706 100644 --- a/distros.d/fedora.json +++ b/distros.d/fedora.json @@ -1,24 +1,24 @@ [ { - "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)", @@ -40,5 +40,19 @@ "os_arch": "ppc64", "os_version": "20", "path": "http://mirrors.kernel.org/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedo..." + }, + { + "name": "Fedora 23 (PPC64)", + "os_distro": "fedora", + "os_arch": "ppc64", + "os_version": "23", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/23/Server/ppc64/iso/Fedo..." + }, + { + "name": "Fedora 23 (PPC64 LE)", + "os_distro": "fedora", + "os_arch": "ppc64le", + "os_version": "23", + "path": "http://mirrors.kernel.org/fedora-secondary/releases/23/Server/ppc64le/iso/Fe..." } ] -- 2.5.5
Two unit tests failed with this patch: ====================================================================== ERROR: test_distros (test_rest.HttpsRestTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_rest.py", line 1350, in test_distros self.assertEquals(distro['name'], ident) KeyError: 'name' ====================================================================== ERROR: test_distros (test_rest.RestTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_rest.py", line 1350, in test_distros self.assertEquals(distro['name'], ident) KeyError: 'name' ---------------------------------------------------------------------- Ran 42 tests in 154.895s FAILED (errors=2) On 06/22/2016 01:30 PM, pvital@linux.vnet.ibm.com wrote:
From: Paulo Vital <pvital@linux.vnet.ibm.com>
V1 -> V2: - Fix missing ","
V1:
This patch-set adds support to recognize Fedora 24 ISO images and add new optins for remote Fedora images.
Paulo Vital (2): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images.
distros.d/fedora.json | 32 +++++++++++++++++++++++--------- isoinfo.py | 1 + 2 files changed, 24 insertions(+), 9 deletions(-)
-- 2.5.5
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
participants (2)
-
Daniel Henrique Barboza -
pvital＠linux.vnet.ibm.com