From 61e425e057fb93ce4988a74f1a7da21bb3acb6fe Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 28 Jun 2018 14:48:36 +0200 Subject: [PATCH 1/2] Add packages for Leap 15.0 JeOS --- totest-manager.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/totest-manager.py b/totest-manager.py index d1e73a6f..fde32cd3 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -847,6 +847,11 @@ class ToTest150Images(ToTestBaseNew): 'livecd-leap-kde', 'livecd-leap-x11', 'opensuse-leap-image', + 'kiwi-templates-Leap15-JeOS:MS-HyperV', + 'kiwi-templates-Leap15-JeOS:OpenStack-Cloud', + 'kiwi-templates-Leap15-JeOS:VMware', + 'kiwi-templates-Leap15-JeOS:XEN', + 'kiwi-templates-Leap15-JeOS:kvm-and-xen', ] ftp_products = [] From ba03166f571279c8e997bfac7b2f550ccfb37b6a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 28 Jun 2018 15:15:20 +0200 Subject: [PATCH 2/2] Adjust opensuse-leap-image references for multibuild --- totest-manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/totest-manager.py b/totest-manager.py index fde32cd3..4142e8b9 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -378,7 +378,7 @@ class ToTestBase(object): return None # docker container has no size limit - if package == 'opensuse-leap-image': + if re.match(r'opensuse-leap-image.*', package): return None if '-Addon-NonOss-ftp-ftp' in package: @@ -846,7 +846,8 @@ class ToTest150Images(ToTestBaseNew): 'livecd-leap-gnome', 'livecd-leap-kde', 'livecd-leap-x11', - 'opensuse-leap-image', + 'opensuse-leap-image:docker', + 'opensuse-leap-image:lxc', 'kiwi-templates-Leap15-JeOS:MS-HyperV', 'kiwi-templates-Leap15-JeOS:OpenStack-Cloud', 'kiwi-templates-Leap15-JeOS:VMware',