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

Integrate coolo's changes in StagingApi class

Browse Source
This commit is contained in:
Alberto Planas 2014-02-11 15:55:24 +01:00 committed by Stephan Kulow
parent d4928998c9
commit f7cff407d4
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
stagingapi.py
View File

@ -9,15 +9,14 @@ import logging
from osc.core import * from osc.core import *
import yaml import yaml
class StagingApi(object): class StagingApi(object):
""" """
Class containing various api calls to work with staging projects. Class containing various api calls to work with staging projects.
""" """
rings = ['openSUSE:Factory:Build', rings = ['openSUSE:Factory:Rings:0-Bootstrap',
'openSUSE:Factory:Core', 'openSUSE:Factory:Rings:1-MinimalX']
'openSUSE:Factory:MainDesktops',
'openSUSE:Factory:DVD']
ring_packages = dict() ring_packages = dict()
apiurl = "" apiurl = ""
@ -109,7 +108,7 @@ class StagingApi(object):
# Verify the package ring # Verify the package ring
ring = self.ring_packages.get(target_package, None) ring = self.ring_packages.get(target_package, None)
# DVD and main desktops are ignored for now # DVD and main desktops are ignored for now
if ring is None or ring == 'openSUSE:Factory:DVD' or ring == 'openSUSE:Factory:MainDesktops': if ring is None:
# accept the request here # accept the request here
message = "No need for staging, not in tested ring project." message = "No need for staging, not in tested ring project."
self.staging_change_review_state(request_id, 'accepted', message) self.staging_change_review_state(request_id, 'accepted', message)
@ -188,6 +187,13 @@ class StagingApi(object):
description = root.find('description') description = root.find('description')
# Replace it with yaml # Replace it with yaml
description.text = yaml.dump(meta) description.text = yaml.dump(meta)
# Find title
title = root.find('title')
# Put something nice into title as well
new_title = []
for request in meta['requests']:
new_title.append(request['package'])
title.text = ', '.join(new_title)
# Write XML back # Write XML back
url = make_meta_url('prj',project, self.apiurl, force=True) url = make_meta_url('prj',project, self.apiurl, force=True)
f = metafile(url, ET.tostring(root)) f = metafile(url, ET.tostring(root))
@ -233,8 +239,17 @@ class StagingApi(object):
src_prj = act.src_project src_prj = act.src_project
src_rev = act.src_rev src_rev = act.src_rev
src_pkg = act.src_package src_pkg = act.src_package
tar_pkg = act.tgt_package
# expand the revision to a md5
url = makeurl(self.apiurl, ['source', src_prj, src_pkg], { 'rev': src_rev, 'expand': 1 })
f = http_GET(url)
root = ET.parse(f).getroot()
src_rev = root.attrib['srcmd5']
src_vrev = root.attrib['vrev']
#print "osc linkpac -r %s %s/%s %s/%s" % (src_rev, src_prj, src_pkg, project, tar_pkg)
# link stuff # link stuff
self._add_rq_to_prj_pseudometa(project, request_id, src_pkg) self._add_rq_to_prj_pseudometa(project, int(request_id), src_pkg)
link_pac(src_prj, src_pkg, project, src_pkg, force=True, rev=src_rev) link_pac(src_prj, src_pkg, project, tar_pkg, force=True, rev=src_rev, vrev=src_vrev)
# FIXME If there are links in parent project, make sure that current # FIXME If there are links in parent project, make sure that current