diff --git a/openqa-comments.py b/openqa-comments.py index 340f6fda..60fda9c7 100644 --- a/openqa-comments.py +++ b/openqa-comments.py @@ -70,13 +70,15 @@ class OpenQAReport(object): def get_broken_package_status(self, info): status = info['broken_packages'] - for subproject in info['subprojects']: + subproject = info['subproject'] + if subproject: status.extend(subproject['broken_packages']) return status def get_openQA_status(self, info): status = info['openqa_jobs'] - for subproject in info['subprojects']: + subproject = info['subproject'] + if subproject: status.extend(subproject['openqa_jobs']) return status @@ -166,6 +168,10 @@ class OpenQAReport(object): report = '\n\n'.join((report_broken_packages, report_openQA)) report = report.strip() if report: + if osc.conf.config['debug']: + print project + print '-' * len(project) + print report self.update_status_comment(project, report) diff --git a/osclib/accept_command.py b/osclib/accept_command.py index 20c7def4..0c10f351 100644 --- a/osclib/accept_command.py +++ b/osclib/accept_command.py @@ -32,10 +32,12 @@ class AcceptCommand(object): return rqs def perform(self, project): - """ - Accept the staging LETTER for review and submit to factory + """Accept the staging LETTER for review and submit to Factory / + openSUSE 13.2 ... + Then disable the build to disabled :param project: staging project we are working with + """ status = self.api.check_project_status(project) @@ -55,12 +57,13 @@ class AcceptCommand(object): print(msg) for req in requests: - change_request_state(self.api.apiurl, str(req), 'accepted', message='Accept to factory') + change_request_state(self.api.apiurl, str(req), 'accepted', message='Accept to %s' % self.api.opensuse) - # A single comment should be enough to notify everybody, since they are - # already mentioned in the comments created by select/unselect + # A single comment should be enough to notify everybody, since + # they are already mentioned in the comments created by + # select/unselect pkg_list = ", ".join(packages) - cmmt = 'Project "{}" accepted. The following packages have been submitted to factory: {}.'.format(project, pkg_list) + cmmt = 'Project "{}" accepted. The following packages have been submitted to {}: {}.'.format(project, self.api.opensuse, pkg_list) self.comment.add_comment(project_name=project, comment=cmmt) # XXX CAUTION - AFAIK the 'accept' command is expected to clean the messages here. @@ -76,7 +79,7 @@ class AcceptCommand(object): changed = False for req in self.find_new_requests('openSUSE:{}'.format(self.api.opensuse)): print 'Accepting request %d: %s' % (req['id'], ','.join(req['packages'])) - change_request_state(self.api.apiurl, str(req['id']), 'accepted', message='Accept to factory') + change_request_state(self.api.apiurl, str(req['id']), 'accepted', message='Accept to %s' % self.api.opensuse) changed = True return changed diff --git a/osclib/check_command.py b/osclib/check_command.py index bb80e09b..0eaab79e 100644 --- a/osclib/check_command.py +++ b/osclib/check_command.py @@ -83,7 +83,8 @@ class CheckCommand(object): report.extend(' %s: fail' % module['name'] for module in job['modules'] if module['result'] == 'fail') break - for subproject in project['subprojects']: + subproject = project['subproject'] + if subproject: subreport = self._report(subproject, verbose, is_subproject=True) if subreport: report.append('') diff --git a/tests/accept_tests.py b/tests/accept_tests.py index c41e6ef0..898216c5 100644 --- a/tests/accept_tests.py +++ b/tests/accept_tests.py @@ -38,6 +38,6 @@ class TestAccept(unittest.TestCase): # But the comment was written at some point self.assertEqual(len(self.obs.comment_bodies), 1) comment = self.obs.comment_bodies[0] - self.assertTrue('The following packages have been submitted to factory' in comment) + self.assertTrue('The following packages have been submitted to Factory' in comment) self.assertTrue('apparmor' in comment) self.assertTrue('mariadb' in comment) diff --git a/tests/fixtures/project/staging_projects/openSUSE:Factory.json b/tests/fixtures/project/staging_projects/openSUSE:Factory.json index 3ee0ac03..5cb8b024 100644 --- a/tests/fixtures/project/staging_projects/openSUSE:Factory.json +++ b/tests/fixtures/project/staging_projects/openSUSE:Factory.json @@ -80,88 +80,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:A:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10674, - "iso": null, - "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10673, - "iso": null, - "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10672, - "iso": null, - "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:A:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10674, + "iso": null, + "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10673, + "iso": null, + "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10672, + "iso": null, + "name": "opensuse-Staging:A-Staging2-DVD-x86_64-Build141.4-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -241,88 +239,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:B:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10524, - "iso": null, - "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10523, - "iso": null, - "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10522, - "iso": null, - "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:B:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10524, + "iso": null, + "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10523, + "iso": null, + "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10522, + "iso": null, + "name": "opensuse-Staging:B-Staging2-DVD-x86_64-Build115.2-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -406,88 +402,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:C:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10458, - "iso": null, - "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10457, - "iso": null, - "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10162, - "iso": null, - "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:C:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10458, + "iso": null, + "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10457, + "iso": null, + "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10162, + "iso": null, + "name": "opensuse-Staging:C-Staging2-DVD-x86_64-Build128.1-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -567,88 +561,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:D:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10573, - "iso": null, - "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:D:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10573, + "iso": null, + "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10572, + "iso": null, + "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10572, - "iso": null, - "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10571, - "iso": null, - "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10571, + "iso": null, + "name": "opensuse-Staging:D-Staging2-DVD-x86_64-Build127.14-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -728,88 +720,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:E:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10658, - "iso": null, - "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10657, - "iso": null, - "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10656, - "iso": null, - "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:E:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10658, + "iso": null, + "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10657, + "iso": null, + "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10656, + "iso": null, + "name": "opensuse-Staging:E-Staging2-DVD-x86_64-Build119.1-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -1015,88 +1005,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:F:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10641, - "iso": null, - "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10640, - "iso": null, - "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10638, - "iso": null, - "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:F:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10641, + "iso": null, + "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10640, + "iso": null, + "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10638, + "iso": null, + "name": "opensuse-Staging:F-Staging2-DVD-x86_64-Build128.5-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -1227,88 +1215,86 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:G:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10634, - "iso": null, - "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10633, - "iso": null, - "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10632, - "iso": null, - "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:G:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10634, + "iso": null, + "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10633, + "iso": null, + "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10632, + "iso": null, + "name": "opensuse-Staging:G-Staging2-DVD-x86_64-Build115.3-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -1434,101 +1420,99 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [ - { - "arch": "x86_64", - "code": "blocked", - "repository": "standard", - "state": "blocked" - }, - { - "arch": "x86_64", - "code": "blocked", - "repository": "images", - "state": "blocked" - } - ], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:H:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10665, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10664, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10662, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "na" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [ + { + "arch": "x86_64", + "code": "blocked", + "repository": "standard", + "state": "blocked" + }, + { + "arch": "x86_64", + "code": "blocked", + "repository": "images", + "state": "blocked" + } + ], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:H:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10665, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10664, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10662, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "na" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -1607,46 +1591,44 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "selected_requests": [], - "broken_packages": [], - "building_repositories": [], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:I:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10467, - "iso": null, - "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-miniuefi", - "result": "passed", - "state": "done" - }, - { - "clone_id": null, - "id": 10466, - "iso": null, - "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-gnome", - "result": "passed", - "state": "done" - }, - { - "clone_id": null, - "id": 10465, - "iso": null, - "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-kde", - "result": "passed", - "state": "done" - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "selected_requests": [], + "broken_packages": [], + "building_repositories": [], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:I:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10467, + "iso": null, + "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-miniuefi", + "result": "passed", + "state": "done" + }, + { + "clone_id": null, + "id": 10466, + "iso": null, + "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-gnome", + "result": "passed", + "state": "done" + }, + { + "clone_id": null, + "id": 10465, + "iso": null, + "name": "opensuse-Staging:I-Staging2-DVD-x86_64-Build117.4-kde", + "result": "passed", + "state": "done" + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }, { @@ -1767,7 +1749,7 @@ ] } ], - "subprojects": [], + "subproject": null, "untracked_requests": [] } ] diff --git a/tests/fixtures/project/staging_projects/openSUSE:Factory/H.json b/tests/fixtures/project/staging_projects/openSUSE:Factory/H.json index 2b62a401..59dbbeb0 100644 --- a/tests/fixtures/project/staging_projects/openSUSE:Factory/H.json +++ b/tests/fixtures/project/staging_projects/openSUSE:Factory/H.json @@ -103,99 +103,97 @@ ] } ], - "subprojects": [ - { - "overall_state": "empty", - "broken_packages": [], - "building_repositories": [ - { - "arch": "x86_64", - "code": "blocked", - "repository": "standard", - "state": "blocked" - }, - { - "arch": "x86_64", - "code": "blocked", - "repository": "images", - "state": "blocked" - } - ], - "description": "", - "missing_reviews": [], - "name": "openSUSE:Factory:Staging:H:DVD", - "obsolete_requests": [], - "openqa_jobs": [ - { - "clone_id": null, - "id": 10665, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-gnome", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "ok" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10664, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-miniuefi", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "ok" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - }, - { - "clone_id": null, - "id": 10662, - "iso": null, - "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-kde", - "result": "passed", - "state": "done", - "modules": [ - { - "name": "isosize", - "result": "ok" - }, - { - "name": "livecdreboot", - "result": "ok" - }, - { - "name": "first_boot", - "result": "ok" - } - ] - } - ], - "subprojects": [], - "untracked_requests": [] - } - ], + "subproject": { + "overall_state": "empty", + "broken_packages": [], + "building_repositories": [ + { + "arch": "x86_64", + "code": "blocked", + "repository": "standard", + "state": "blocked" + }, + { + "arch": "x86_64", + "code": "blocked", + "repository": "images", + "state": "blocked" + } + ], + "description": "", + "missing_reviews": [], + "name": "openSUSE:Factory:Staging:H:DVD", + "obsolete_requests": [], + "openqa_jobs": [ + { + "clone_id": null, + "id": 10665, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-gnome", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "ok" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10664, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-miniuefi", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "ok" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + }, + { + "clone_id": null, + "id": 10662, + "iso": null, + "name": "opensuse-Staging:H-Staging2-DVD-x86_64-Build110.12-kde", + "result": "passed", + "state": "done", + "modules": [ + { + "name": "isosize", + "result": "ok" + }, + { + "name": "livecdreboot", + "result": "ok" + }, + { + "name": "first_boot", + "result": "ok" + } + ] + } + ], + "subproject": null, + "untracked_requests": [] + }, "untracked_requests": [] }