Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2020-02-03 11:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools" Mon Feb 3 11:14:06 2020 rev:274 rq:769219 version:20200131.e3c26df9 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2020-01-31 23:59:01.455705498 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.26092/openSUSE-release-tools.changes 2020-02-03 11:14:22.513876983 +0100 @@ -1,0 +2,18 @@ +Fri Jan 31 18:22:12 UTC 2020 - opensuse-releaset...@opensuse.org + +- Update to version 20200131.e3c26df9: + * Staging accept: No longer set the version in .product files on accept + +------------------------------------------------------------------- +Fri Jan 31 13:05:35 UTC 2020 - opensuse-releaset...@opensuse.org + +- Update to version 20200131.ff898552: + * Unify the handling of standard and images repository + +------------------------------------------------------------------- +Fri Jan 31 12:18:16 UTC 2020 - opensuse-releaset...@opensuse.org + +- Update to version 20200131.1f26d7bc: + * Dashboard: add ARM:Live + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20200131.38632736.obscpio New: ---- openSUSE-release-tools-20200131.e3c26df9.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.rkWDWL/_old 2020-02-03 11:14:23.429877446 +0100 +++ /var/tmp/diff_new_pack.rkWDWL/_new 2020-02-03 11:14:23.429877446 +0100 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20200131.38632736 +Version: 20200131.e3c26df9 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.rkWDWL/_old 2020-02-03 11:14:23.461877463 +0100 +++ /var/tmp/diff_new_pack.rkWDWL/_new 2020-02-03 11:14:23.465877465 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">34ecf36d357e0f1fbf345a7ccb9d66e9663b37d8</param> + <param name="changesrevision">e3c26df939e6990621c69b1fd42bd9c4254437fa</param> </service> </servicedata> ++++++ openSUSE-release-tools-20200131.38632736.obscpio -> openSUSE-release-tools-20200131.e3c26df9.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200131.38632736/dashboard/generate.py new/openSUSE-release-tools-20200131.e3c26df9/dashboard/generate.py --- old/openSUSE-release-tools-20200131.38632736/dashboard/generate.py 2020-01-31 08:53:01.000000000 +0100 +++ new/openSUSE-release-tools-20200131.e3c26df9/dashboard/generate.py 2020-01-31 19:20:49.000000000 +0100 @@ -61,7 +61,10 @@ def build_summary(self, project, repository): url = makeurl(self.apiurl, ['build', project, '_result'], { 'repository': repository, 'view': 'summary' }) - f = http_GET(url) + try: + f = http_GET(url) + except HTTPError as e: + return { 'building': -1 } root = ET.parse(f).getroot() failed = 0 unresolvable = 0 @@ -87,6 +90,8 @@ if building > 0: building += unresolvable unresolvable = 0 + if building + failed + succeeded == 0: + return {'building': -1} return { 'building': 1000 - int(building * 1000 / (building + failed + succeeded)), 'failed': failed, 'unresolvable': unresolvable } @@ -123,15 +128,8 @@ self.ttm_status = fetcher.fetch_ttm_status(name) self.ttm_version = fetcher.fetch_product_version(name) - def standard_progress(self): - return fetcher.build_summary(self.name, 'standard') - - def images_progress(self): - try: - return fetcher.build_summary(self.name, 'images') - except HTTPError as e: - print(f"failed to fetch images for {self.name}", file=sys.stderr) - return {'building': -1} + def build_summary(self, repo): + return fetcher.build_summary(self.name, repo) def all_archs(self): self.all_archs @@ -164,6 +162,7 @@ fetcher.add('openSUSE:Factory:Rings:0-Bootstrap', nick='Ring 0') fetcher.add('openSUSE:Factory:Rings:1-MinimalX', nick='Ring 1') fetcher.add('openSUSE:Factory:ARM', nick='ARM', download_url='http://download.opensuse.org/ports/aarch64/tumbleweed/iso/', openqa_groupid=3) + fetcher.add('openSUSE:Factory:ARM:Live', nick='ARM Live') fetcher.add('openSUSE:Factory:PowerPC', nick='Power', download_url='http://download.opensuse.org/ports/ppc/tumbleweed/iso/', openqa_groupid=4) fetcher.add('openSUSE:Factory:zSystems', nick='System Z', download_url='http://download.opensuse.org/ports/zsystems/tumbleweed/iso/', openqa_groupid=34) fetcher.add('openSUSE:Factory:RISCV', nick='Risc V', download_url='http://download.opensuse.org/ports/riscv/tumbleweed/iso/') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200131.38632736/dashboard/templates/dashboard.html new/openSUSE-release-tools-20200131.e3c26df9/dashboard/templates/dashboard.html --- old/openSUSE-release-tools-20200131.38632736/dashboard/templates/dashboard.html 2020-01-31 08:53:01.000000000 +0100 +++ new/openSUSE-release-tools-20200131.e3c26df9/dashboard/templates/dashboard.html 2020-01-31 19:20:49.000000000 +0100 @@ -33,36 +33,14 @@ <tr> <th scope="row"><a href="https://build.opensuse.org/project/show/{{ project.name }}">{{project.nick}}</a></th> <td> - {% set progress = project.standard_progress() %} - {% if progress['building'] < 1000 %} - {{ progress['building'] / 10}}% done - {% else %} - done - {% endif %} - {% if progress['failed'] > 0 %} - , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a> - {% endif %} - {% if progress['unresolvable'] > 0 %} - , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_standard=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a> - {% endif %} + {% with repository = 'standard' %} + {% include "repository.html" %} + {% endwith %} </td> <td> - {% set progress = project.images_progress() %} - {% if progress['building'] >= 0 %} - {% if progress['building'] < 1000 %} - {{ progress['building'] / 10}}% done - {% else %} - done - {% endif %} - {% if progress['failed'] > 0 %} - , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a> - {% endif %} - {% if progress['unresolvable'] > 0 %} - , <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_images=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a> - {% endif %} - {% else %} - n.a. - {% endif %} + {% with repository = 'images' %} + {% include "repository.html" %} + {% endwith %} </td> <td> {% if project.ttm_version %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200131.38632736/dashboard/templates/repository.html new/openSUSE-release-tools-20200131.e3c26df9/dashboard/templates/repository.html --- old/openSUSE-release-tools-20200131.38632736/dashboard/templates/repository.html 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE-release-tools-20200131.e3c26df9/dashboard/templates/repository.html 2020-01-31 19:20:49.000000000 +0100 @@ -0,0 +1,16 @@ +{% set progress = project.build_summary(repository) %} +{% if progress['building'] >= 0 %} + {% if progress['building'] < 1000 %} + {{ progress['building'] / 10}}% done + {% else %} + done + {% endif %} + {% if progress['failed'] > 0 %} +, <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?failed=1&defaults=0&repo_{{repository}}=1&{{project.all_archs}}">{{ progress['failed'] }} failed</a> + {% endif %} + {% if progress['unresolvable'] > 0 %} +, <a href="https://build.opensuse.org/project/monitor/{{ project.name }}?unresolvable=1&defaults=0&repo_{{repository}}=1&{{project.all_archs}}">{{ progress['unresolvable'] }} unresolvable</a> + {% endif %} +{% else %} + n.a. +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200131.38632736/osclib/accept_command.py new/openSUSE-release-tools-20200131.e3c26df9/osclib/accept_command.py --- old/openSUSE-release-tools-20200131.38632736/osclib/accept_command.py 2020-01-31 08:53:01.000000000 +0100 +++ new/openSUSE-release-tools-20200131.e3c26df9/osclib/accept_command.py 2020-01-31 19:20:49.000000000 +0100 @@ -237,29 +237,13 @@ project = self.api.project curr_version = date.today().strftime('%Y%m%d') - update_version_attr = False - url = self.api.makeurl(['source', project], {'view': 'productlist'}) - products = ET.parse(http_GET(url)).getroot() - for product in products.findall('product'): - product_name = product.get('name') + '.product' - product_pkg = product.get('originpackage') - product_spec = source_file_load(self.api.apiurl, project, product_pkg, product_name) - new_product = re.sub(r'<version>\d{8}</version>', '<version>%s</version>' % curr_version, product_spec) - - if product_spec != new_product: - update_version_attr = True - url = self.api.makeurl(['source', project, product_pkg, product_name]) - http_PUT(url + '?comment=Update+version', data=new_product) - - if update_version_attr: - self.update_version_attribute(project, curr_version) + self.update_version_attribute(project, curr_version) ports_prjs = ['PowerPC', 'ARM', 'zSystems' ] - for ports in ports_prjs: project = self.api.project + ':' + ports - if self.api.item_exists(project) and update_version_attr: + if self.api.item_exists(project): self.update_version_attribute(project, curr_version) def sync_buildfailures(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200131.38632736/tests/accept_tests.py new/openSUSE-release-tools-20200131.e3c26df9/tests/accept_tests.py --- old/openSUSE-release-tools-20200131.38632736/tests/accept_tests.py 2020-01-31 08:53:01.000000000 +0100 +++ new/openSUSE-release-tools-20200131.e3c26df9/tests/accept_tests.py 2020-01-31 19:20:49.000000000 +0100 @@ -24,6 +24,7 @@ self.winerq = wf.create_submit_request('devel:wine', 'wine', text='Hallo World') self.assertEqual(True, SelectCommand(wf.api, self.prj).perform(['wine'])) self.comments = self.c_api.get_comments(project_name=self.prj) + wf.create_attribute_type('OSRT', 'ProductVersion', 1) return wf def test_accept_comments(self): ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.rkWDWL/_old 2020-02-03 11:14:23.909877689 +0100 +++ /var/tmp/diff_new_pack.rkWDWL/_new 2020-02-03 11:14:23.909877689 +0100 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20200131.38632736 -mtime: 1580457181 -commit: 3863273695ceff2aed38e4116255bebf0ca66ee7 +version: 20200131.e3c26df9 +mtime: 1580494849 +commit: e3c26df939e6990621c69b1fd42bd9c4254437fa