Merge pull request #714 from jberry-suse/rebuild-command

osc-staging: provide rebuild command.

osc-staging.py

@@ -44,6 +44,7 @@
 from osclib.cache import Cache
 from osclib.unselect_command import UnselectCommand
 from osclib.repair_command import RepairCommand
+from osclib.rebuild_command import RebuildCommand
 from osclib.request_splitter import RequestSplitter
 
 OSC_STAGING_VERSION = '0.0.1'
@@ -205,6 +206,8 @@ def do_staging(self, subcmd, opts, *args):
 
     "unlock" will remove the staging lock in case it gets stuck
 
+    "rebuild" will rebuild broken packages in the given stagings or all
+
     Usage:
         osc staging accept [--force] [--no-cleanup] [LETTER...]
         osc staging acheck
@@ -223,6 +226,7 @@ def do_staging(self, subcmd, opts, *args):
             [STAGING...] [REQUEST...]
         osc staging unselect REQUEST...
         osc staging unlock
+        osc staging rebuild [STAGING...]
         osc staging repair REQUEST...
     """
     if opts.version:
@@ -252,6 +256,8 @@ def do_staging(self, subcmd, opts, *args):
         min_args, max_args = 0, 0
     elif cmd == 'unlock':
         min_args, max_args = 0, 0
+    elif cmd == 'rebuild':
+        min_args, max_args = 0, None
     else:
         raise oscerr.WrongArgs('Unknown command: %s' % cmd)
     if len(args) - 1 < min_args:
@@ -466,5 +472,7 @@ def do_staging(self, subcmd, opts, *args):
             ListCommand(api).perform(args[1:], supersede=opts.supersede)
         elif cmd == 'adi':
             AdiCommand(api).perform(args[1:], move=opts.move, by_dp=opts.by_develproject, split=opts.split)
+        elif cmd == 'rebuild':
+            RebuildCommand(api).perform(args[1:])
         elif cmd == 'repair':
             RepairCommand(api).perform(args[1:])

osclib/rebuild_command.py

@@ -0,0 +1,17 @@
+from osc.core import get_request
+from osclib.comments import CommentAPI
+
+
+class RebuildCommand(object):
+    def __init__(self, api):
+        self.api = api
+
+    def perform(self, stagings=None):
+        if not stagings:
+            stagings = self.api.get_staging_projects_short()
+
+        for staging in stagings:
+            status = self.api.project_status(staging)
+            rebuilt = self.api.rebuild_broken(status)
+            for key, code in rebuilt.items():
+                print('rebuild {} {}'.format(key, code))

osclib/stagingapi.py

@@ -35,6 +35,7 @@
 from osc.core import http_GET
 from osc.core import http_POST
 from osc.core import http_PUT
+from osc.core import rebuild
 
 from osclib.cache import Cache
 from osclib.comments import CommentAPI
@@ -735,6 +736,22 @@ def check_ring_packages(self, project, requests):
 
         return False
 
+    def rebuild_broken(self, status):
+        """ Rebuild broken packages given a staging's status information. """
+        rebuilt = {}
+        for package in status['broken_packages']:
+            package = {k: str(v) for k, v in package.items()}
+            code = rebuild(self.apiurl, package['project'], package['package'],
+                           package['repository'], package['arch'])
+            key = '/'.join((package['project'], package['package'], package['repository'], package['arch']))
+            rebuilt[key] = code
+
+        for project in status['subprojects']:
+            if project:
+                rebuilt.update(self.rebuild_broken(project))
+
+        return rebuilt
+
     def project_status(self, project):
         short = self.extract_staging_short(project)
         query = {'format': 'json'}