Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2019-09-23 12:38:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools" Mon Sep 23 12:38:52 2019 rev:220 rq:732304 version:20190920.155606e3 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2019-09-20 14:52:37.750889387 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.7948/openSUSE-release-tools.changes 2019-09-23 12:39:27.725589778 +0200 @@ -1,0 +2,37 @@ +Fri Sep 20 11:05:25 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190920.155606e3: + * factory-package-news: fixes for Tumbleweed + +------------------------------------------------------------------- +Thu Sep 19 07:51:10 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190919.8df44507: + * gocd/monitors: *.OriginManagerUpdate: set timeout to 10 minutes. + +------------------------------------------------------------------- +Thu Sep 19 01:32:31 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190918.c185be8c: + * ReviewBot: add_review(): handle 403 as expected when superseded/rovoked. + +------------------------------------------------------------------- +Thu Sep 19 00:54:16 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190918.abb40adc: + * ReviewBot: _set_review(): handle review being revoked or superseded. + +------------------------------------------------------------------- +Thu Sep 19 00:39:15 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190918.abd6f65f: + * osclib/core: request_create_delete(): utilize pusedo osc.core function. + * osclib/core: provide create_delete_request(). + +------------------------------------------------------------------- +Wed Sep 18 22:21:43 UTC 2019 - opensuse-releaset...@opensuse.org + +- Update to version 20190918.d0e2b71e: + * osclib/origin_listener: skip patchinfo packages. + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20190918.1d4c6836.obscpio New: ---- openSUSE-release-tools-20190920.155606e3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.018JBy/_old 2019-09-23 12:39:28.261589690 +0200 +++ /var/tmp/diff_new_pack.018JBy/_new 2019-09-23 12:39:28.265589689 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20190918.1d4c6836 +Version: 20190920.155606e3 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.018JBy/_old 2019-09-23 12:39:28.309589682 +0200 +++ /var/tmp/diff_new_pack.018JBy/_new 2019-09-23 12:39:28.309589682 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">3175c0d7f678933f2c0d4124cf00aad0d56d8fd8</param> + <param name="changesrevision">155606e3d848327ec20ff6713282a1dc54ae7484</param> </service> </servicedata> ++++++ openSUSE-release-tools-20190918.1d4c6836.obscpio -> openSUSE-release-tools-20190920.155606e3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190918.1d4c6836/ReviewBot.py new/openSUSE-release-tools-20190920.155606e3/ReviewBot.py --- old/openSUSE-release-tools-20190918.1d4c6836/ReviewBot.py 2019-09-18 23:59:51.000000000 +0200 +++ new/openSUSE-release-tools-20190920.155606e3/ReviewBot.py 2019-09-20 13:02:48.000000000 +0200 @@ -268,10 +268,15 @@ if doit == True: self.logger.debug("setting %s to %s"%(req.reqid, state)) if not self.dryrun: - osc.core.change_review_state(apiurl = self.apiurl, + try: + osc.core.change_review_state(apiurl=self.apiurl, reqid = req.reqid, newstate = newstate, by_group=self.review_group, by_user=self.review_user, message=msg) + except HTTPError as e: + if e.code != 403: + raise e + self.logger.info('unable to change review state (likely superseded or revoked)') else: self.logger.debug("%s review not changed"%(req.reqid)) @@ -317,7 +322,15 @@ key = request_action_key(self.action) msg = yaml.dump({key: msg}, default_flow_style=False) - r = osc.core.http_POST(u, data=msg) + try: + r = osc.core.http_POST(u, data=msg) + except HTTPError as e: + if e.code != 403: + raise e + del query['cmd'] + self.logger.info('unable to add review {} with message: {}'.format(query, msg)) + return + code = ET.parse(r).getroot().attrib['code'] if code != 'ok': raise Exception('non-ok return code: {}'.format(code)) @@ -328,14 +341,7 @@ self.logger.warning('no devel project found for {}/{}'.format(project, package)) return False - try: - self.add_review(request, by_project=devel_project, by_package=devel_package, msg=message) - except HTTPError as e: - # could happen when the bot is not actually a reviewer and has no permissions - if e.code != 403: - raise e - self.logger.error('failed to add devel project review for {}/{}'.format(devel_project, devel_package)) - return False + self.add_review(request, by_project=devel_project, by_package=devel_package, msg=message) return True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190918.1d4c6836/factory-package-news/factory-package-news.py new/openSUSE-release-tools-20190920.155606e3/factory-package-news/factory-package-news.py --- old/openSUSE-release-tools-20190918.1d4c6836/factory-package-news/factory-package-news.py 2019-09-18 23:59:51.000000000 +0200 +++ new/openSUSE-release-tools-20190920.155606e3/factory-package-news/factory-package-news.py 2019-09-20 13:02:48.000000000 +0200 @@ -102,7 +102,9 @@ if not iso.is_open() or fd is None: raise Exception("Could not open %s as an ISO-9660 image." % arg) - for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64', '/suse/s390x']: + # On Tumbleweed, there is no '/suse' prefix + for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64', '/suse/s390x', + '/x86_64', '/noarch', '/aarch64', '/s390x' ]: file_stats = iso.readdir(path) if file_stats is None: continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190918.1d4c6836/gocd/monitors.gocd.yaml new/openSUSE-release-tools-20190920.155606e3/gocd/monitors.gocd.yaml --- old/openSUSE-release-tools-20190918.1d4c6836/gocd/monitors.gocd.yaml 2019-09-18 23:59:51.000000000 +0200 +++ new/openSUSE-release-tools-20190920.155606e3/gocd/monitors.gocd.yaml 2019-09-20 13:02:48.000000000 +0200 @@ -129,7 +129,7 @@ type: manual jobs: Run: - timeout: 0 + timeout: 10 # 5 minute still alive message resources: - monitor tasks: @@ -156,7 +156,7 @@ type: manual jobs: Run: - timeout: 0 + timeout: 10 # 5 minute still alive message resources: - monitor tasks: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190918.1d4c6836/osclib/core.py new/openSUSE-release-tools-20190920.155606e3/osclib/core.py --- old/openSUSE-release-tools-20190918.1d4c6836/osclib/core.py 2019-09-18 23:59:51.000000000 +0200 +++ new/openSUSE-release-tools-20190920.155606e3/osclib/core.py 2019-09-20 13:02:48.000000000 +0200 @@ -986,14 +986,40 @@ message = message_suffix('created', message) def create_function(): - subprocess.check_call( - ' '.join(['osc', 'dr', '-m', message, target_project, target_package]), shell=True) - - # Would be nicer to return newly create request ID, but not worth rewriting. - return True + return create_delete_request(apiurl, target_project, target_package, message) return RequestFuture('delete {}/{}'.format(target_project, target_package), create_function) +# Should exist within osc.core like create_submit_request(), but rather it was +# duplicated in osc.commandline. +def create_delete_request(apiurl, target_project, target_package=None, message=None): + if not message: + message = message_suffix('created') + + request = ETL.Element('request') + + state = ETL.Element('state') + state.set('name', 'new') + request.append(state) + + description = ETL.Element('description') + description.text = message + request.append(description) + + action = ETL.Element('action') + action.set('type', 'delete') + request.append(action) + + target = ETL.Element('target') + target.set('project', target_project) + if target_package: + target.set('package', target_package) + action.append(target) + + url = makeurl(apiurl, ['request'], {'cmd': 'create'}) + root = ETL.parse(http_POST(url, data=ETL.tostring(request))).getroot() + return root.get('id') + class RequestFuture: def __init__(self, description, create_function): self.description = description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190918.1d4c6836/osclib/origin_listener.py new/openSUSE-release-tools-20190920.155606e3/osclib/origin_listener.py --- old/openSUSE-release-tools-20190918.1d4c6836/osclib/origin_listener.py 2019-09-18 23:59:51.000000000 +0200 +++ new/openSUSE-release-tools-20190920.155606e3/osclib/origin_listener.py 2019-09-20 13:02:48.000000000 +0200 @@ -69,6 +69,8 @@ project = action['targetproject'] package = action['targetpackage'] elif action['type'] == 'maintenance_incident': + if action['sourcepackage'] == 'patchinfo': + continue project = action['target_releaseproject'] if not action.get('targetpackage'): package = action['sourcepackage'] @@ -76,6 +78,8 @@ repository_suffix_length = len(project) + 1 # package.project package = action['targetpackage'][:-repository_suffix_length] elif action['type'] == 'maintenance_release': + if action['sourcepackage'] == 'patchinfo': + continue project = action['targetproject'] repository_suffix_length = len(project) + 1 # package.project package = action['sourcepackage'][:-repository_suffix_length] ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.018JBy/_old 2019-09-23 12:39:28.865589591 +0200 +++ /var/tmp/diff_new_pack.018JBy/_new 2019-09-23 12:39:28.865589591 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20190918.1d4c6836 -mtime: 1568843991 -commit: 1d4c68365c42183db9b8628ead01b8c3f150ccd9 +version: 20190920.155606e3 +mtime: 1568977368 +commit: 155606e3d848327ec20ff6713282a1dc54ae7484