mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 01:06:17 +02:00
Code

support building for kiwi products using obsrepositories:/

Browse Source
This commit is contained in:
Adrian Schröter 2019-12-04 14:37:31 +01:00
parent b329b74816
commit b08bd8a437
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -7,6 +7,7 @@
* --vm-disk-size= switch supported (has only an effect on clean builds)
* repository, architecture and vm_type from last build is automatically
reused if not specified otherwise.
* support building for kiwi products using obsrepositories:/
0.166.2
- Don't enforce password reuse (boo#1156501)

21
osc/build.py
View File

@ -1094,11 +1094,26 @@ def main(apiurl, opts, argv):
print(open(build_descr).read(), file=sys.stderr)
sys.exit(1)
root = tree.getroot()
# product
for xml in root.findall('instsource'):
if xml.find('instrepo').find('source').get('path') == 'obsrepositories:/':
print("obsrepositories:/ for product builds is not yet supported in osc!")
sys.exit(1)
found_obsrepositories = 0
for node in xml.findall('instrepo'):
if node and node.find('source').get('path') == 'obsrepositories:/':
found_obsrepositories = found_obsrepositories + 1
for path in bi.pathes:
new_node = ET.SubElement(xml, 'instrepo')
new_node.set('name', node.get('name') + "_" + str(found_obsrepositories))
new_node.set('priority', node.get('priority'))
new_node.set('local', 'true')
new_source_node = ET.SubElement(new_node, 'source')
new_source_node.set('path', "obs://" + path)
xml.remove(node)
if found_obsrepositories > 0:
build_descr = '_service:' + build_descr.rsplit('/', 1)[-1]
tree.write(open(build_descr, 'wb'))
# appliance
expand_obsrepos=None
for xml in root.findall('repository'):