From 42291d90b5f48b8c9a2d032a7e6ef875f97306ae Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Fri, 20 Mar 2015 17:47:58 +0100 Subject: [PATCH 1/3] Adjust Ring2 dvd for PowerPC Signed-off-by: Dinar Valeev --- create_test_Factory_dvd-2.testcase | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/create_test_Factory_dvd-2.testcase b/create_test_Factory_dvd-2.testcase index d76e274a..e3bc3bf2 100644 --- a/create_test_Factory_dvd-2.testcase +++ b/create_test_Factory_dvd-2.testcase @@ -19,13 +19,10 @@ job install provides pattern() = kde job install provides pattern() = kde4_basis job install provides pattern() = kde4_multimedia job install provides pattern() = kde4_utilities -job install provides pattern() = laptop job install provides pattern() = multimedia -job install provides pattern() = office job install provides pattern() = minimal_base job install provides pattern() = rest_core_dvd -job install provides virtualbox-guest-kmp job install name aaa_base-extras job install name branding-openSUSE @@ -33,8 +30,6 @@ job install name openSUSE-release-livecd-x11 job install name sudo job install name xdelta job install name kate -job install name MozillaThunderbird -job install name libreoffice job lock name gtk2-branding-upstream job lock name gdm-branding-upstream @@ -43,7 +38,14 @@ job lock name kdm-branding-upstream job lock name kdebase4-runtime-branding-upstream job lock name kdelibs4-branding-upstream job lock name readline-doc +#ifdef __x86_64__ +job install provides pattern() = laptop +job install provides pattern() = office +job install name MozillaThunderbird +job install name libreoffice job lock name libgcc_s1-32bit +job install provides virtualbox-guest-kmp +#endif job lock name gtk3-branding-upstream job lock name openvpn From 272ef52583dfac54b061c857fb4cb73012bece84 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Tue, 24 Mar 2015 14:25:31 +0100 Subject: [PATCH 2/3] set maxsize for ppc ftp product Signed-off-by: Dinar Valeev --- totest-manager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/totest-manager.py b/totest-manager.py index 43eb4858..5542c140 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -198,6 +198,9 @@ class ToTestBase(object): if package == '_product:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64': return None + if package == '_product:openSUSE-ftp-ftp-ppc_ppc64_ppc64le': + return None + raise Exception('No maxsize for {}'.format(package)) def package_ok(self, project, package, repository, arch): From a4905a25469e2bd1d371f7ed5594219595d726c2 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Wed, 25 Mar 2015 01:22:15 +0100 Subject: [PATCH 3/3] more hardcoded x86 removal Signed-off-by: Dinar Valeev --- osclib/cleanup_rings.py | 4 ++-- totest-manager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osclib/cleanup_rings.py b/osclib/cleanup_rings.py index 2eb34c91..71813c47 100644 --- a/osclib/cleanup_rings.py +++ b/osclib/cleanup_rings.py @@ -83,7 +83,7 @@ class CleanupRings(object): self.fill_pkgdeps(prj, 'standard', arch) if prj == '{}:1-MinimalX'.format(self.api.crings): - url = makeurl(self.api.apiurl, ['build', prj, 'images', 'x86_64', 'Test-DVD-' + arch, '_buildinfo']) + url = makeurl(self.api.apiurl, ['build', prj, 'images', arch, 'Test-DVD-' + arch, '_buildinfo']) root = ET.parse(http_GET(url)).getroot() for bdep in root.findall('bdep'): if 'name' not in bdep.attrib: @@ -95,7 +95,7 @@ class CleanupRings(object): self.pkgdeps[b] = 'MYdvd' if prj == '{}:2-TestDVD'.format(self.api.crings): - url = makeurl(self.api.apiurl, ['build', prj, 'images', 'x86_64', 'Test-DVD-' + arch, '_buildinfo']) + url = makeurl(self.api.apiurl, ['build', prj, 'images', arch, 'Test-DVD-' + arch, '_buildinfo']) root = ET.parse(http_GET(url)).getroot() for bdep in root.findall('bdep'): if 'name' not in bdep.attrib: diff --git a/totest-manager.py b/totest-manager.py index 5542c140..88d66e79 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -376,7 +376,7 @@ class ToTestFactory(ToTestBase): # for Factory we check the version of the release package def current_version(self): - url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', 'x86_64', + url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', self.arch(), '_product:openSUSE-release']) f = self.api.retried_GET(url) root = ET.parse(f).getroot() @@ -411,7 +411,7 @@ class ToTestFactoryPowerPC(ToTestBase): # for Factory we check the version of the release package def current_version(self): - url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', 'ppc64le', + url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', self.arch(), '_product:openSUSE-release']) f = self.api.retried_GET(url) root = ET.parse(f).getroot()