Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-09-27 14:53:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Sep 27 14:53:16 2019 rev:223 rq:733584 version:20190926.456b203a
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-09-26 20:40:39.094635869 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2352/openSUSE-release-tools.changes
2019-09-27 14:53:46.023934950 +0200
@@ -1,0 +2,60 @@
+Thu Sep 26 16:57:06 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.456b203a:
+ * Kill review bots if they didn't output anything for 30 minutes
+
+-------------------------------------------------------------------
+Thu Sep 26 14:44:35 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.40a88ace:
+ * rebuildpacs: Ignore order of problems
+
+-------------------------------------------------------------------
+Thu Sep 26 14:38:29 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.6ed04ab7:
+ * osclib/origin_listener: change from package.update to package.commit event.
+
+-------------------------------------------------------------------
+Thu Sep 26 13:59:35 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.1942065b:
+ * osclib/origin: origin_annotation_load(): only return dict annotation.
+ * osclib/origin: origin_annotation_load(): only consider accepted reviews.
+ * osclib/core: review_find_last(): provide states filter.
+
+-------------------------------------------------------------------
+Thu Sep 26 13:44:39 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.b8ec607f:
+ * origin-manager: utilize ReviewBot.request_age_wait().
+ * ReviewBot: provide request_age_wait().
+
+-------------------------------------------------------------------
+Thu Sep 26 12:57:57 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190926.0acfbc28:
+ * osclib/core: rename request_action_single_list() to
request_action_simple_list().
+ * osclib/core: switch request_action_single_list() users to
request_action_list().
+ * osclib/core: request_action_single_list(): handle miltiple actions.
+ * osclib/core: request_action_single_list(): exclude sourced requests.
+
+-------------------------------------------------------------------
+Wed Sep 25 18:19:38 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190925.438b38fc:
+ * gocd/checkers: revert Origin.Manager.Update frequency back to daily.
+
+-------------------------------------------------------------------
+Wed Sep 25 12:01:50 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190925.8a0e6ed3:
+ * check_source: when kind is None then it can be a new package
+
+-------------------------------------------------------------------
+Wed Sep 25 09:19:24 UTC 2019 - opensuse-releaset...@opensuse.org
+
+- Update to version 20190925.9af682c9:
+ * check_source: don't enforce name for kiwi images
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190924.e9a2774a.obscpio
New:
----
openSUSE-release-tools-20190926.456b203a.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.bSu3TI/_old 2019-09-27 14:53:57.867904152 +0200
+++ /var/tmp/diff_new_pack.bSu3TI/_new 2019-09-27 14:53:57.875904131 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190924.e9a2774a
+Version: 20190926.456b203a
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.bSu3TI/_old 2019-09-27 14:53:57.907904048 +0200
+++ /var/tmp/diff_new_pack.bSu3TI/_new 2019-09-27 14:53:57.907904048 +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">e9a2774a4530d223cb7f3a6b2a90edcb10cd7e85</param>
+ <param
name="changesrevision">456b203a64f5ed67b1bb2e63f661ff2dc4d37c1e</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20190924.e9a2774a.obscpio ->
openSUSE-release-tools-20190926.456b203a.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/ReviewBot.py
new/openSUSE-release-tools-20190926.456b203a/ReviewBot.py
--- old/openSUSE-release-tools-20190924.e9a2774a/ReviewBot.py 2019-09-24
23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/ReviewBot.py 2019-09-26
18:56:27.000000000 +0200
@@ -15,6 +15,7 @@
from osclib.core import group_members
from osclib.core import maintainers_get
from osclib.core import request_action_key
+from osclib.core import request_age
from osclib.memoize import memoize
from osclib.memoize import memoize_session_reset
from osclib.sentry import sentry_init
@@ -114,6 +115,8 @@
self.comment_handler = False
self.override_allow = True
self.override_group_key =
'{}-override-group'.format(self.bot_name.lower())
+ self.request_age_min_default = 0
+ self.request_age_min_key =
'{}-request-age-min'.format(self.bot_name.lower())
self.lookup = PackageLookup(self.apiurl)
self.load_config()
@@ -772,6 +775,25 @@
return False
+ def request_age_wait(self, age_min=None, request=None,
target_project=None):
+ if not request:
+ request = self.request
+
+ if not target_project:
+ target_project = self.action.tgt_project
+
+ if age_min is None or isinstance(age_min, str):
+ key = self.request_age_min_key if age_min is None else age_min
+ age_min = int(Config.get(self.apiurl, target_project).get(key,
self.request_age_min_default))
+
+ age = request_age(request).total_seconds()
+ if age < age_min:
+ self.logger.info('skipping {} of age {:.2f}s since it is younger
than {}s'.format(
+ request.reqid, age, age_min))
+ return True
+
+ return False
+
class CommentFromLogHandler(logging.Handler):
def __init__(self, level=logging.INFO):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/check_source.py
new/openSUSE-release-tools-20190926.456b203a/check_source.py
--- old/openSUSE-release-tools-20190924.e9a2774a/check_source.py
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/check_source.py
2019-09-26 18:56:27.000000000 +0200
@@ -82,7 +82,7 @@
if kind == 'meta':
self.review_messages['accepted'] = 'Skipping all checks for meta
packages'
return True
- elif kind != 'source':
+ elif (kind is not None and kind != 'source'):
self.review_messages['accepted'] = 'May not modify a non-source
package of type {}'.format(kind)
return False
@@ -150,7 +150,7 @@
shutil.rmtree(os.path.join(target_package, '.osc'))
new_info = self.package_source_parse(source_project, source_package,
source_revision)
- if new_info['name'] != target_package:
+ if not new_info['filename'].endswith('.kiwi') and new_info['name'] !=
target_package:
shutil.rmtree(dir)
self.review_messages['declined'] = "A package submitted as %s has
to build as 'Name: %s' - found Name '%s'" % (target_package, target_package,
new_info['name'])
return False
@@ -299,6 +299,9 @@
if xml.find('version') is not None:
ret['version'] = xml.find('version').text
+ if xml.find('filename') is not None:
+ ret['filename'] = xml.find('filename').text
+
return ret
def only_changes(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.opensuse.gocd.yaml
new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.opensuse.gocd.yaml
---
old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.opensuse.gocd.yaml
2019-09-24 23:18:23.000000000 +0200
+++
new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.opensuse.gocd.yaml
2019-09-26 18:56:27.000000000 +0200
@@ -16,7 +16,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -37,7 +37,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -58,7 +58,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -80,7 +80,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -101,7 +101,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -122,7 +122,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -143,7 +143,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -164,7 +164,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -185,7 +185,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -235,7 +235,7 @@
script:
git: https://github.com/openSUSE/openSUSE-release-tools.git
timer:
- spec: 0 0 7 ? * SUN
+ spec: 0 0 7 ? * *
only_on_changes: false
stages:
- Run:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.suse.gocd.yaml
new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.suse.gocd.yaml
--- old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.suse.gocd.yaml
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.suse.gocd.yaml
2019-09-26 18:56:27.000000000 +0200
@@ -16,7 +16,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -37,13 +37,13 @@
approval: manual
jobs:
SLE_15_SP2:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
- script: ./project-installcheck.py -A https://api.suse.de --debug
check --store SUSE:SLE-15-SP2:GA:Staging/dashboard --no-rebuild
SUSE:SLE-15-SP2:GA
SLE_12_SP5:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -63,7 +63,7 @@
approval: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- leaper
tasks:
@@ -95,7 +95,7 @@
script:
git: https://github.com/openSUSE/openSUSE-release-tools.git
timer:
- spec: 0 0 7 ? * SUN
+ spec: 0 0 7 ? * *
only_on_changes: false
stages:
- Run:
@@ -126,7 +126,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -161,7 +161,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -182,7 +182,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -203,7 +203,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -225,7 +225,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -248,7 +248,7 @@
- SUSE:SLE-12-SP5:GA:Staging:A_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -273,7 +273,7 @@
- SUSE:SLE-12-SP5:GA:Staging:B_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -298,7 +298,7 @@
- SUSE:SLE-12-SP5:GA:Staging:C_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -323,7 +323,7 @@
- SUSE:SLE-12-SP5:GA:Staging:D_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -348,7 +348,7 @@
- SUSE:SLE-12-SP5:GA:Staging:H_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -373,7 +373,7 @@
- SUSE:SLE-12-SP5:GA:Staging:S_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -398,7 +398,7 @@
- SUSE:SLE-12-SP5:GA:Staging:V_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -423,7 +423,7 @@
- SUSE:SLE-12-SP5:GA:Staging:Y_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.suse.gocd.yaml.erb
new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.suse.gocd.yaml.erb
---
old/openSUSE-release-tools-20190924.e9a2774a/gocd/checkers.suse.gocd.yaml.erb
2019-09-24 23:18:23.000000000 +0200
+++
new/openSUSE-release-tools-20190926.456b203a/gocd/checkers.suse.gocd.yaml.erb
2019-09-26 18:56:27.000000000 +0200
@@ -16,7 +16,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -37,13 +37,13 @@
approval: manual
jobs:
SLE_15_SP2:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
- script: ./project-installcheck.py -A https://api.suse.de --debug
check --store SUSE:SLE-15-SP2:GA:Staging/dashboard --no-rebuild
SUSE:SLE-15-SP2:GA
SLE_12_SP5:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
@@ -63,7 +63,7 @@
approval: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- leaper
tasks:
@@ -95,7 +95,7 @@
script:
git: https://github.com/openSUSE/openSUSE-release-tools.git
timer:
- spec: 0 0 7 ? * SUN
+ spec: 0 0 7 ? * *
only_on_changes: false
stages:
- Run:
@@ -126,7 +126,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -161,7 +161,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -182,7 +182,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -203,7 +203,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -225,7 +225,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -249,7 +249,7 @@
- SUSE:SLE-12-SP5:GA:Staging:<%= letter %>_-_standard.yaml
stages:
- Run:
- timeout: 0
+ timeout: 30
resources:
- repo-checker
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/monitors.gocd.yaml
new/openSUSE-release-tools-20190926.456b203a/gocd/monitors.gocd.yaml
--- old/openSUSE-release-tools-20190924.e9a2774a/gocd/monitors.gocd.yaml
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/gocd/monitors.gocd.yaml
2019-09-26 18:56:27.000000000 +0200
@@ -18,7 +18,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- monitor
tasks:
@@ -44,7 +44,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- monitor
tasks:
@@ -71,7 +71,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- monitor
tasks:
@@ -101,7 +101,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- monitor
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging-bot-reminder.gocd.yaml
new/openSUSE-release-tools-20190926.456b203a/gocd/staging-bot-reminder.gocd.yaml
---
old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging-bot-reminder.gocd.yaml
2019-09-24 23:18:23.000000000 +0200
+++
new/openSUSE-release-tools-20190926.456b203a/gocd/staging-bot-reminder.gocd.yaml
2019-09-26 18:56:27.000000000 +0200
@@ -14,7 +14,7 @@
- Run:
approval:
type: manual
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging.bot.gocd.yaml
new/openSUSE-release-tools-20190926.456b203a/gocd/staging.bot.gocd.yaml
--- old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging.bot.gocd.yaml
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/gocd/staging.bot.gocd.yaml
2019-09-26 18:56:27.000000000 +0200
@@ -40,7 +40,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
@@ -100,7 +100,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging.bot.gocd.yaml.erb
new/openSUSE-release-tools-20190926.456b203a/gocd/staging.bot.gocd.yaml.erb
--- old/openSUSE-release-tools-20190924.e9a2774a/gocd/staging.bot.gocd.yaml.erb
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/gocd/staging.bot.gocd.yaml.erb
2019-09-26 18:56:27.000000000 +0200
@@ -42,7 +42,7 @@
type: manual
jobs:
Run:
- timeout: 0
+ timeout: 30
resources:
- staging-bot
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/origin-manager.py
new/openSUSE-release-tools-20190926.456b203a/origin-manager.py
--- old/openSUSE-release-tools-20190924.e9a2774a/origin-manager.py
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/origin-manager.py
2019-09-26 18:56:27.000000000 +0200
@@ -15,6 +15,9 @@
ReviewBot.ReviewBot.__init__(self, *args, **kwargs)
# ReviewBot options.
+ # Younger than default splitter-request-age-threshold to allow for
quick
+ # strategy to still be useful which requires a completed review.
+ self.request_age_min_default = 30 * 60
self.request_default_return = True
self.override_allow = False
@@ -41,6 +44,10 @@
if not advance:
return result
+ if self.request_age_wait():
+ # Allow for parallel submission to be created.
+ return None
+
source_hash_new = package_source_hash(self.apiurl, src_project,
src_package, src_rev)
origin_info_new = origin_find(self.apiurl, tgt_project, tgt_package,
source_hash_new)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/osclib/core.py
new/openSUSE-release-tools-20190926.456b203a/osclib/core.py
--- old/openSUSE-release-tools-20190924.e9a2774a/osclib/core.py 2019-09-24
23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/osclib/core.py 2019-09-26
18:56:27.000000000 +0200
@@ -29,6 +29,7 @@
from osc.core import show_results_meta
from osc.core import xpath_join
from osc.util.helper import decode_it
+from osc import conf
from osclib.conf import Config
from osclib.memoize import memoize
import subprocess
@@ -708,9 +709,9 @@
return apiurl, project
-def review_find_last(request, user):
+def review_find_last(request, user, states=['all']):
for review in reversed(request.reviews):
- if review.by_user == user:
+ if review.by_user == user and ('all' in states or review.state in
states):
return review
return None
@@ -920,13 +921,18 @@
yield request, action
break
-def request_action_single_list(apiurl, project, package, states, request_type):
- # TODO To be consistent this should not include request source from
project.
- for request in get_request_list(apiurl, project, package, None, states,
request_type):
- if len(request.actions) > 1:
- raise Exception('request {} has more than one
action'.format(request.reqid))
+def request_action_simple_list(apiurl, project, package, states, request_type):
+ # Disable including source project in get_request_list() query.
+ before = conf.config['include_request_from_project']
+ conf.config['include_request_from_project'] = False
+ requests = get_request_list(apiurl, project, package, None, states,
request_type)
+ conf.config['include_request_from_project'] = before
- yield request, request.actions[0]
+ for request in requests:
+ for action in request.actions:
+ if action.tgt_project == project and action.tgt_package == package:
+ yield request, action
+ break
def request_action_list(apiurl, project, package, states=['new', 'review'],
types=['submit']):
for request_type in types:
@@ -935,7 +941,7 @@
if request_type == 'maintenance_release':
yield from request_action_list_maintenance_release(apiurl,
project, package, states)
else:
- yield from request_action_single_list(apiurl, project, package,
states, request_type)
+ yield from request_action_simple_list(apiurl, project, package,
states, request_type)
def request_action_list_source(apiurl, project, package, states=['new',
'review'], include_release=False):
types = []
@@ -959,8 +965,8 @@
# No sense submitting identical sources.
return False
- for request, action in request_action_single_list(
- apiurl, target_project, target_package, REQUEST_STATES_MINUS_ACCEPTED,
'submit'):
+ for request, action in request_action_list(
+ apiurl, target_project, target_package, REQUEST_STATES_MINUS_ACCEPTED,
['submit']):
source_hash_pending = package_source_hash(
apiurl, action.src_project, action.src_package, action.src_rev)
if source_hash_pending == source_hash_consider:
@@ -978,8 +984,8 @@
source_project, source_package, target_project, target_package),
create_function)
def request_create_delete(apiurl, target_project, target_package,
message=None):
- for request, action in request_action_single_list(
- apiurl, target_project, target_package, REQUEST_STATES_MINUS_ACCEPTED,
'delete'):
+ for request, action in request_action_list(
+ apiurl, target_project, target_package, REQUEST_STATES_MINUS_ACCEPTED,
['delete']):
return False
# No proper API function to perform the same operation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/osclib/origin.py
new/openSUSE-release-tools-20190926.456b203a/osclib/origin.py
--- old/openSUSE-release-tools-20190924.e9a2774a/osclib/origin.py
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/osclib/origin.py
2019-09-26 18:56:27.000000000 +0200
@@ -318,7 +318,8 @@
return yaml.dump(data, default_flow_style=False)
def origin_annotation_load(request, action, user):
- review = review_find_last(request, user)
+ # Find last accepted review which means it was reviewed and annotated.
+ review = review_find_last(request, user, ['accepted'])
if not review:
return False
@@ -331,7 +332,8 @@
comment_stripped = re.sub(r'^ ', '', review.comment,
flags=re.MULTILINE)
annotation = yaml.safe_load(comment_stripped)
- if not annotation:
+ if not annotation or type(annotation) is not dict:
+ # Only returned structured data (ie. dict), otherwise None.
return None
if len(request.actions) > 1:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/osclib/origin_listener.py
new/openSUSE-release-tools-20190926.456b203a/osclib/origin_listener.py
--- old/openSUSE-release-tools-20190924.e9a2774a/osclib/origin_listener.py
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/osclib/origin_listener.py
2019-09-26 18:56:27.000000000 +0200
@@ -36,7 +36,7 @@
def routing_keys(self):
return [self._prefix + k for k in [
- '.obs.package.update',
+ '.obs.package.commit',
'.obs.request.create',
]]
@@ -44,7 +44,7 @@
super().on_message(unused_channel, method, properties, body)
payload = json.loads(body)
- if method.routing_key == '{}.obs.package.update'.format(self._prefix):
+ if method.routing_key == '{}.obs.package.commit'.format(self._prefix):
self.on_message_package_update(payload)
elif method.routing_key ==
'{}.obs.request.create'.format(self._prefix):
self.on_message_request_create(payload)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190924.e9a2774a/project-installcheck.py
new/openSUSE-release-tools-20190926.456b203a/project-installcheck.py
--- old/openSUSE-release-tools-20190924.e9a2774a/project-installcheck.py
2019-09-24 23:18:23.000000000 +0200
+++ new/openSUSE-release-tools-20190926.456b203a/project-installcheck.py
2019-09-26 18:56:27.000000000 +0200
@@ -177,7 +177,7 @@
if not per_source[source]['builds']: # nothing we can do
continue
old_output = oldstate['check'].get(source, {}).get('problem', [])
- if old_output == per_source[source]['output']:
+ if sorted(old_output) == sorted(per_source[source]['output']):
self.logger.debug("unchanged problem")
continue
self.logger.info("rebuild %s", source)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.bSu3TI/_old 2019-09-27 14:53:58.599902248 +0200
+++ /var/tmp/diff_new_pack.bSu3TI/_new 2019-09-27 14:53:58.603902238 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190924.e9a2774a
-mtime: 1569359903
-commit: e9a2774a4530d223cb7f3a6b2a90edcb10cd7e85
+version: 20190926.456b203a
+mtime: 1569516987
+commit: 456b203a64f5ed67b1bb2e63f661ff2dc4d37c1e
