Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2020-03-05 23:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Thu Mar 5 23:25:00 2020 rev:285 rq:781827 version:20200305.63aa406d
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2020-03-04 09:44:55.066090059 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.26092/openSUSE-release-tools.changes
2020-03-05 23:25:18.101410545 +0100
@@ -1,0 +2,9 @@
+Thu Mar 05 11:22:34 UTC 2020 - [email protected]
+
+- Update to version 20200305.63aa406d:
+ * Let the rabbit monitors run for 3 hours instead of one
+ * Make rabbit-repoid more stable
+ * cleanup_rings: fix python3 bytes/string type error
+ * requestfinder: print all actions
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20200303.fbc0a9e0.obscpio
New:
----
openSUSE-release-tools-20200305.63aa406d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.7aPf6j/_old 2020-03-05 23:25:21.209412254 +0100
+++ /var/tmp/diff_new_pack.7aPf6j/_new 2020-03-05 23:25:21.245412274 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20200303.fbc0a9e0
+Version: 20200305.63aa406d
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.7aPf6j/_old 2020-03-05 23:25:21.625412484 +0100
+++ /var/tmp/diff_new_pack.7aPf6j/_new 2020-03-05 23:25:21.629412485 +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">bab96c2f3037540bcc0fff891bc37dce9122068d</param>
+ <param
name="changesrevision">63aa406da3100e61d0cc562e1ba281af63b284db</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20200303.fbc0a9e0.obscpio ->
openSUSE-release-tools-20200305.63aa406d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200303.fbc0a9e0/gocd/rabbit-openqa.py
new/openSUSE-release-tools-20200305.63aa406d/gocd/rabbit-openqa.py
--- old/openSUSE-release-tools-20200303.fbc0a9e0/gocd/rabbit-openqa.py
2020-03-03 12:53:55.000000000 +0100
+++ new/openSUSE-release-tools-20200305.63aa406d/gocd/rabbit-openqa.py
2020-03-05 12:20:54.000000000 +0100
@@ -272,6 +272,6 @@
l.add(Project(entry.get('name')))
try:
- l.run(runtime=3600)
+ l.run(runtime=10800)
except KeyboardInterrupt:
l.stop()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200303.fbc0a9e0/gocd/rabbit-repoid.py
new/openSUSE-release-tools-20200305.63aa406d/gocd/rabbit-repoid.py
--- old/openSUSE-release-tools-20200303.fbc0a9e0/gocd/rabbit-repoid.py
2020-03-03 12:53:55.000000000 +0100
+++ new/openSUSE-release-tools-20200305.63aa406d/gocd/rabbit-repoid.py
2020-03-05 12:20:54.000000000 +0100
@@ -23,6 +23,16 @@
self.apiurl = apiurl
self.amqp_prefix = amqp_prefix
self.namespaces = namespaces
+ self.repositories_to_check = []
+
+ def interval(self):
+ if len(self.repositories_to_check):
+ return 5
+ return 300
+
+ def still_alive(self):
+ self.check_some_repos()
+ super(Listener, self).still_alive()
def routing_keys(self):
return [self.amqp_prefix + '.obs.repo.build_finished']
@@ -64,11 +74,20 @@
state = state.replace('.yaml', '')
# split
project, repository = state.split('_-_')
- self.update_repo(project, repository)
- self.push_git('Restart of Repo Monitor')
- self.logger.info('Finished refreshing repoids')
+ self.repositories_to_check.append([project, repository])
+ self.check_some_repos()
super(Listener, self).start_consuming()
+ def check_some_repos(self):
+ count = 0
+ limit = 25
+ while len(self.repositories_to_check):
+ project, repository = self.repositories_to_check.pop()
+ self.logger.debug(f"Check repo {project}/{repository}")
+ count += 1
+ if count >= limit:
+ return
+
def push_git(self, message):
os.system('git add . ')
os.system('git commit -m "{}" > /dev/null'.format(message))
@@ -82,8 +101,11 @@
with open(pathname, 'w') as f:
for arch in sorted(ids.keys()):
f.write('{}: {}\n'.format(arch, ids[arch]))
+ self.push_git('Repository update: {}/{}'.format(project, repository))
def on_message(self, unused_channel, method, properties, body):
+ self.logger.debug("on_message")
+ self.check_some_repos()
self.acknowledge_message(method.delivery_tag)
try:
body = json.loads(body)
@@ -95,7 +117,6 @@
self.restart_timer()
self.logger.info('Repo finished event:
{}/{}/{}'.format(body['project'], body['repo'], body['arch']))
self.update_repo(body['project'], body['repo'])
- self.push_git('Repository finished: {}/{}'.format(body['project'],
body['repo']))
else:
self.logger.warning(
'unknown rabbitmq message {}'.format(method.routing_key))
@@ -120,11 +141,11 @@
else:
amqp_prefix = 'opensuse'
- logging.basicConfig(level=logging.INFO)
+ logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
listener = Listener(apiurl, amqp_prefix, args.namespaces)
try:
- listener.run(3600)
+ listener.run(108000)
except KeyboardInterrupt:
listener.stop()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200303.fbc0a9e0/osclib/PubSubConsumer.py
new/openSUSE-release-tools-20200305.63aa406d/osclib/PubSubConsumer.py
--- old/openSUSE-release-tools-20200303.fbc0a9e0/osclib/PubSubConsumer.py
2020-03-03 12:53:55.000000000 +0100
+++ new/openSUSE-release-tools-20200305.63aa406d/osclib/PubSubConsumer.py
2020-03-05 12:20:54.000000000 +0100
@@ -40,10 +40,15 @@
self._run_until = None
self.logger = logger
+ # to be overwritten dynamically by subclass
+ def interval(self):
+ return 300
+
def restart_timer(self):
- interval = 300
+ interval = None
if self._timer_id:
self._connection.ioloop.remove_timeout(self._timer_id)
+ interval = self.interval()
else:
# check the initial state on first timer hit
# so be quick about it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200303.fbc0a9e0/osclib/cleanup_rings.py
new/openSUSE-release-tools-20200305.63aa406d/osclib/cleanup_rings.py
--- old/openSUSE-release-tools-20200303.fbc0a9e0/osclib/cleanup_rings.py
2020-03-03 12:53:55.000000000 +0100
+++ new/openSUSE-release-tools-20200305.63aa406d/osclib/cleanup_rings.py
2020-03-05 12:20:54.000000000 +0100
@@ -143,6 +143,7 @@
def check_buildconfig(self, project):
url = makeurl(self.api.apiurl, ['build', project, 'standard',
'_buildconfig'])
for line in http_GET(url).read().splitlines():
+ line = line.decode('utf-8')
if line.startswith('Preinstall:') or line.startswith('Support:'):
for prein in line.split(':')[1].split():
if prein not in self.bin2src:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200303.fbc0a9e0/requestfinder.py
new/openSUSE-release-tools-20200305.63aa406d/requestfinder.py
--- old/openSUSE-release-tools-20200303.fbc0a9e0/requestfinder.py
2020-03-03 12:53:55.000000000 +0100
+++ new/openSUSE-release-tools-20200305.63aa406d/requestfinder.py
2020-03-05 12:20:54.000000000 +0100
@@ -75,6 +75,16 @@
if self.cp.has_option(section, option):
settings[option] = self.cp.get(section, option).replace('\n',
' ')
+ def print_actions(self, r):
+ for a in r.actions:
+ if a.type == 'submit':
+ print(' '.join(('#', r.reqid, a.type, a.src_project,
a.src_package, a.tgt_project)))
+ else:
+ if hasattr(a, 'tgt_package'):
+ print(' '. join(('#', r.reqid, a.type, a.tgt_project,
a.tgt_package)))
+ else:
+ print(' '. join(('#', r.reqid, a.type, a.tgt_project)))
+
@cmdln.option('--exclude-project', metavar='PROJECT', action='append',
help='exclude review by specific project')
@cmdln.option('--exclude-user', metavar='USER', action='append',
help='exclude review by specific user')
@cmdln.option('--query', metavar='filterstr', help='filter string')
@@ -120,10 +130,7 @@
rqs = self.tool.find_requests(settings)
for r in rqs:
- if r.actions[0].type == 'submit':
- print(' '.join(('#', r.reqid, r.actions[0].type,
r.actions[0].src_project, r.actions[0].src_package, r.actions[0].tgt_project)))
- else:
- print(' '. join(('#', r.reqid, r.actions[0].type,
r.actions[0].tgt_project)))
+ self.print_actions(r)
for review in r.reviews:
if review.state != 'new':
continue
@@ -195,10 +202,7 @@
rqs = self.tool.find_requests(settings)
for r in rqs:
- if r.actions[0].type == 'submit':
- print(' '.join(('#', r.reqid, r.actions[0].type,
r.actions[0].src_project, r.actions[0].src_package, r.actions[0].tgt_project)))
- else:
- print(' '. join(('#', r.reqid, r.actions[0].type,
r.actions[0].tgt_project)))
+ self.print_actions(r)
print("osc rq {} -m '{}' {}".format(settings['action'],
settings['message'], r.reqid))
def help_examples(self):
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.7aPf6j/_old 2020-03-05 23:25:23.053413269 +0100
+++ /var/tmp/diff_new_pack.7aPf6j/_new 2020-03-05 23:25:23.053413269 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20200303.fbc0a9e0
-mtime: 1583236435
-commit: fbc0a9e068434024e39779002c2ecbca9f97bb3a
+version: 20200305.63aa406d
+mtime: 1583407254
+commit: 63aa406da3100e61d0cc562e1ba281af63b284db
