yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow projects (42) to exclude archs (ppc64le)

Browse Source
This commit is contained in:
Stephan Kulow 2015-07-19 17:50:46 +02:00
parent 50aeb49eb8
commit 555c23e10c
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/conf.py
View File

@ -33,6 +33,7 @@ DEFAULT = {
r'openSUSE:(?P<project>[-\w\d]+)': { r'openSUSE:(?P<project>[-\w\d]+)': {
'staging': 'openSUSE:%(project)s:Staging', 'staging': 'openSUSE:%(project)s:Staging',
'staging-group': '%(project.lower)s-staging', 'staging-group': '%(project.lower)s-staging',
'staging-archs': 'i586 x86_64 ppc64le',
'rings': 'openSUSE:%(project)s:Rings', 'rings': 'openSUSE:%(project)s:Rings',
'nonfree': 'openSUSE:%(project)s:NonFree', 'nonfree': 'openSUSE:%(project)s:NonFree',
'rebuild': 'openSUSE:%(project)s:Rebuild', 'rebuild': 'openSUSE:%(project)s:Rebuild',
@ -44,6 +45,7 @@ DEFAULT = {
r'SUSE:(?P<project>.*$)': { r'SUSE:(?P<project>.*$)': {
'staging': 'SUSE:%(project)s:Staging', 'staging': 'SUSE:%(project)s:Staging',
'staging-group': 'sle-staging-managers', # '%(project.lower)s-staging', 'staging-group': 'sle-staging-managers', # '%(project.lower)s-staging',
'staging-archs': 'i586 x86_64',
'rings': None, 'rings': None,
'nonfree': None, 'nonfree': None,
'rebuild': None, 'rebuild': None,

23
osclib/freeze_command.py
View File

@ -179,29 +179,24 @@ class FreezeCommand(object):
r = ET.SubElement(root, 'repository', {'name': 'bootstrap_copy'}) r = ET.SubElement(root, 'repository', {'name': 'bootstrap_copy'})
ET.SubElement(r, 'path', {'project': self.api.cstaging, 'repository': 'standard'}) ET.SubElement(r, 'path', {'project': self.api.cstaging, 'repository': 'standard'})
a = ET.SubElement(r, 'arch') for arch in self.api.cstaging_archs:
a.text = 'i586' a = ET.SubElement(r, 'arch')
a = ET.SubElement(r, 'arch') a.text = arch
a.text = 'x86_64'
a = ET.SubElement(r, 'arch')
a.text = 'ppc64le'
r = ET.SubElement(root, 'repository', {'name': 'standard', 'linkedbuild': 'all', 'rebuild': 'direct'}) r = ET.SubElement(root, 'repository', {'name': 'standard', 'linkedbuild': 'all', 'rebuild': 'direct'})
ET.SubElement(r, 'path', {'project': prj, 'repository': 'bootstrap_copy'}) ET.SubElement(r, 'path', {'project': prj, 'repository': 'bootstrap_copy'})
a = ET.SubElement(r, 'arch') for arch in self.api.cstaging_archs:
a.text = 'i586' a = ET.SubElement(r, 'arch')
a = ET.SubElement(r, 'arch') a.text = arch
a.text = 'x86_64'
a = ET.SubElement(r, 'arch')
a.text = 'ppc64le'
r = ET.SubElement(root, 'repository', {'name': 'images', 'linkedbuild': 'all', 'rebuild': 'direct'}) r = ET.SubElement(root, 'repository', {'name': 'images', 'linkedbuild': 'all', 'rebuild': 'direct'})
ET.SubElement(r, 'path', {'project': prj, 'repository': 'standard'}) ET.SubElement(r, 'path', {'project': prj, 'repository': 'standard'})
a = ET.SubElement(r, 'arch') a = ET.SubElement(r, 'arch')
a.text = 'x86_64' a.text = 'x86_64'
a = ET.SubElement(r, 'arch') if 'ppc64le' in self.api.cstaging_archs:
a.text = 'ppc64le' a = ET.SubElement(r, 'arch')
a.text = 'ppc64le'
return ET.tostring(root) return ET.tostring(root)

1
osclib/stagingapi.py
View File

@ -51,6 +51,7 @@ class StagingAPI(object):
# Store some prefix / data used in the code. # Store some prefix / data used in the code.
self.cstaging = conf.config[project]['staging'] self.cstaging = conf.config[project]['staging']
self.cstaging_group = conf.config[project]['staging-group'] self.cstaging_group = conf.config[project]['staging-group']
self.cstaging_archs = conf.config[project]['staging-archs'].split(' ')
self.crings = conf.config[project]['rings'] self.crings = conf.config[project]['rings']
self.cnonfree = conf.config[project]['nonfree'] self.cnonfree = conf.config[project]['nonfree']
self.crebuild = conf.config[project]['rebuild'] self.crebuild = conf.config[project]['rebuild']