Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-08-29 17:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Thu Aug 29 17:25:00 2019 rev:210 rq:726832 version:20190828.14971e2d
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-08-28 18:35:19.997285258 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.7948/openSUSE-release-tools.changes
2019-08-29 17:25:02.803292218 +0200
@@ -1,0 +2,28 @@
+Wed Aug 28 20:39:27 UTC 2019 - [email protected]
+
+- Update to version 20190828.14971e2d:
+ * osc-origin: capture exception with sentry to ensure they are reported.
+ * check_source: check for target package not found when checking out.
+ * ReviewBot: action_method(): drop request.type sentry extra in favor or
action.key.
+ * ReviewBot: simplify sentry_sdk initialization line since defined globally.
+ * ReviewBot: provide request.id and action.key as sentry extras.
+ * ReviewBot: action_method(): reduce sentry extra to filter(None, ...).
+ * osclib/common: provide version_calcuate() and utilize by default.
+ * osclib/git: provide describe().
+ * osclib/git: remove unnecessary CacheManager import.
+
+-------------------------------------------------------------------
+Wed Aug 28 14:44:50 UTC 2019 - [email protected]
+
+- Update to version 20190828.97f37e80:
+ * gocd: use sep pipeline for build-fail-reminder
+ * gocd: add Leap 15.2 announcer
+ * checknewer.py: Use python3 shebang
+
+-------------------------------------------------------------------
+Wed Aug 28 10:13:21 UTC 2019 - [email protected]
+
+- Update to version 20190828.30c7a9a2:
+ * update_repo_handler: properly extract factory build string
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190827.7f92a226.obscpio
New:
----
openSUSE-release-tools-20190828.14971e2d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.xlv4a1/_old 2019-08-29 17:25:03.671292074 +0200
+++ /var/tmp/diff_new_pack.xlv4a1/_new 2019-08-29 17:25:03.671292074 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190827.7f92a226
+Version: 20190828.14971e2d
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.xlv4a1/_old 2019-08-29 17:25:03.723292065 +0200
+++ /var/tmp/diff_new_pack.xlv4a1/_new 2019-08-29 17:25:03.723292065 +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">7f92a226fcba1d6e4626c18479e8d2f79b49174e</param>
+ <param
name="changesrevision">14971e2db055eaecb3b8f0486523f09977d6987b</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20190827.7f92a226.obscpio ->
openSUSE-release-tools-20190828.14971e2d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20190827.7f92a226/Makefile
new/openSUSE-release-tools-20190828.14971e2d/Makefile
--- old/openSUSE-release-tools-20190827.7f92a226/Makefile 2019-08-27
15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/Makefile 2019-08-28
22:34:02.000000000 +0200
@@ -18,7 +18,7 @@
for i in osc-*.py osclib; do ln -s $(pkgdatadir)/$$i
$(DESTDIR)$(oscplugindir)/$$i; done
for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
install -m 644 systemd/* $(DESTDIR)$(unitdir)
- sed -i "s/VERSION = '.*'/VERSION = '$(VERSION)'/" \
+ sed -i "s/VERSION = .*/VERSION = '$(VERSION)'/" \
$(DESTDIR)$(pkgdatadir)/osclib/common.py
for i in $(pkgdata_BINS); do ln -s $(pkgdatadir)/$$i
$(DESTDIR)$(bindir)/osrt-$${i%.*}; done
install -m 755 script/* $(DESTDIR)$(bindir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/ReviewBot.py
new/openSUSE-release-tools-20190828.14971e2d/ReviewBot.py
--- old/openSUSE-release-tools-20190827.7f92a226/ReviewBot.py 2019-08-27
15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/ReviewBot.py 2019-08-28
22:34:02.000000000 +0200
@@ -176,6 +176,8 @@
for req in self.requests:
self.logger.info("checking %s"%req.reqid)
self.request = req
+ with sentry_sdk.configure_scope() as scope:
+ scope.set_extra('request.id', self.request.reqid)
override = self.request_override_check(req)
if override is not None:
@@ -392,6 +394,9 @@
# Store in-case sub-classes need direct access to original values.
self.action = a
+ key = request_action_key(a)
+ with sentry_sdk.configure_scope() as scope:
+ scope.set_extra('action.key', key)
func = getattr(self, self.action_method(a))
ret = func(req, a)
@@ -404,7 +409,6 @@
overall = ret
if self.multiple_actions and ret is not None:
- key = request_action_key(a)
message_key = self.review_message_key(ret)
review_messages_multi[key] = self.review_messages[message_key]
@@ -430,12 +434,6 @@
elif action.tgt_repository is not None:
method_suffix = 'repository'
- with sentry_sdk.configure_scope() as scope:
- scope.set_extra('request_type', '_'.join([method_type,
method_suffix]))
- else:
- with sentry_sdk.configure_scope() as scope:
- scope.set_extra('request_type', method_type)
-
if method_suffix:
method = '_'.join([method_prefix, method_type, method_suffix])
if hasattr(self, method):
@@ -828,7 +826,7 @@
if self.options.fallback_group:
self.checker.fallback_group = self.options.fallback_group
- globals()['sentry_sdk'] = sentry_init(conf.config['apiurl'], {
+ sentry_sdk = sentry_init(conf.config['apiurl'], {
'review_bot': self.clazz.__name__,
'review_user': self.checker.review_user,
})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/check_source.py
new/openSUSE-release-tools-20190828.14971e2d/check_source.py
--- old/openSUSE-release-tools-20190827.7f92a226/check_source.py
2019-08-27 15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/check_source.py
2019-08-28 22:34:02.000000000 +0200
@@ -132,8 +132,11 @@
shutil.rmtree(os.path.join(target_package, '.osc'))
os.rename(target_package, '_old')
old_info = self.package_source_parse(target_project,
target_package)
- except HTTPError:
- self.logger.error('failed to checkout %s/%s' % (target_project,
target_package))
+ except HTTPError as e:
+ if e.code == 404:
+ self.logger.info('target package does not exist %s/%s' %
(target_project, target_package))
+ else:
+ raise e
CheckSource.checkout_package(self.apiurl, source_project,
source_package, revision=source_revision,
pathname=dir, server_service_files=True,
expand_link=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/checknewer.py
new/openSUSE-release-tools-20190828.14971e2d/checknewer.py
--- old/openSUSE-release-tools-20190827.7f92a226/checknewer.py 2019-08-27
15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/checknewer.py 2019-08-28
22:34:02.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# check if all packages in a repo are newer than all other repos
from __future__ import print_function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/gocd/announcer.gocd.yaml
new/openSUSE-release-tools-20190828.14971e2d/gocd/announcer.gocd.yaml
--- old/openSUSE-release-tools-20190827.7f92a226/gocd/announcer.gocd.yaml
2019-08-27 15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/gocd/announcer.gocd.yaml
2019-08-28 22:34:02.000000000 +0200
@@ -54,3 +54,21 @@
- staging-bot
tasks:
- script: ./factory-package-news/announcer.py --config
config/announcer/openSUSE:MicroOS.yml --verbose --state-file
/home/go/config/announcer.yaml
+ Announcer.Leap:
+ group: openSUSE.Checkers
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ materials:
+ script:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ timer:
+ spec: 0 3 * ? * *
+ only_on_changes: false
+ stages:
+ - Run:
+ approval: manual
+ resources:
+ - staging-bot
+ tasks:
+ - script: ./factory-package-news/announcer.py --config
config/announcer/openSUSE:Leap:15.2.yml --verbose --state-file
/home/go/config/announcer.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/gocd/announcer.gocd.yaml.erb
new/openSUSE-release-tools-20190828.14971e2d/gocd/announcer.gocd.yaml.erb
--- old/openSUSE-release-tools-20190827.7f92a226/gocd/announcer.gocd.yaml.erb
2019-08-27 15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/gocd/announcer.gocd.yaml.erb
2019-08-28 22:34:02.000000000 +0200
@@ -1,6 +1,6 @@
format_version: 3
pipelines:
-<% ['Factory', 'Kubic', 'MicroOS'].each_with_index do |project, index| -%>
+<% ['Factory', 'Kubic', 'MicroOS', 'Leap:15.2'].each_with_index do |project,
index| -%>
Announcer.<%= project %>:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/gocd/build-fail-reminder.yaml
new/openSUSE-release-tools-20190828.14971e2d/gocd/build-fail-reminder.yaml
--- old/openSUSE-release-tools-20190827.7f92a226/gocd/build-fail-reminder.yaml
2019-08-27 15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/gocd/build-fail-reminder.yaml
2019-08-28 22:34:02.000000000 +0200
@@ -1,6 +1,6 @@
format_version: 3
pipelines:
- TTM.Factory:
+ BuildFailReminder.Factory:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
environment_variables:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/osc-origin.py
new/openSUSE-release-tools-20190828.14971e2d/osc-origin.py
--- old/openSUSE-release-tools-20190827.7f92a226/osc-origin.py 2019-08-27
15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/osc-origin.py 2019-08-28
22:34:02.000000000 +0200
@@ -91,10 +91,14 @@
if not config:
raise oscerr.WrongArgs('OSRT:OriginConfig attribute missing from
{}'.format(opts.project))
- sentry_init(apiurl, {'osc_plugin': subcmd})
-
- function = 'osrt_origin_{}'.format(command)
- globals()[function](apiurl, opts, *args[1:])
+ sentry_sdk = sentry_init(apiurl, {'osc_plugin': subcmd})
+ try:
+ function = 'osrt_origin_{}'.format(command)
+ globals()[function](apiurl, opts, *args[1:])
+ except Exception as e:
+ # Capture exception as osc.babysitter will consume any plugin
exception.
+ sentry_sdk.capture_exception(e)
+ raise e
def osrt_origin_config(apiurl, opts, *args):
config = config_load(apiurl, opts.project)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/osclib/common.py
new/openSUSE-release-tools-20190828.14971e2d/osclib/common.py
--- old/openSUSE-release-tools-20190827.7f92a226/osclib/common.py
2019-08-27 15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/osclib/common.py
2019-08-28 22:34:02.000000000 +0200
@@ -1,2 +1,14 @@
NAME = 'openSUSE-release-tools'
-VERSION = '0.0.0-dev'
+
+def version_calculate():
+ from os import path
+ if path.exists('.git'):
+ from osclib.git import describe
+ try:
+ return describe()
+ except FileNotFoundError:
+ pass # Fall through to final return.
+
+ return '0.0.0-dev'
+
+VERSION = version_calculate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/osclib/git.py
new/openSUSE-release-tools-20190828.14971e2d/osclib/git.py
--- old/openSUSE-release-tools-20190827.7f92a226/osclib/git.py 2019-08-27
15:38:57.000000000 +0200
+++ new/openSUSE-release-tools-20190828.14971e2d/osclib/git.py 2019-08-28
22:34:02.000000000 +0200
@@ -1,10 +1,21 @@
import os
from os import path
-from osclib.cache_manager import CacheManager
import subprocess
-# Git will not be happy if pruned, but not used enough to be worth excluding.
-CACHE_DIR = CacheManager.directory('git')
+def describe(directory=None):
+ if directory:
+ cwd = os.getcwd()
+ os.chdir(directory)
+
+ ret = subprocess.run(
+ ['git', 'show', '--no-patch', '--date=short', '--format=%cd.%h'],
+ capture_output=True, text=True)
+
+ if directory:
+ os.chdir(cwd)
+
+ ret.check_returncode()
+ return ret.stdout.strip().replace('-', '')
def clone(url, directory):
return_code = subprocess.call(['git', 'clone', url, directory])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190827.7f92a226/pkglistgen/update_repo_handler.py
new/openSUSE-release-tools-20190828.14971e2d/pkglistgen/update_repo_handler.py
---
old/openSUSE-release-tools-20190827.7f92a226/pkglistgen/update_repo_handler.py
2019-08-27 15:38:57.000000000 +0200
+++
new/openSUSE-release-tools-20190828.14971e2d/pkglistgen/update_repo_handler.py
2019-08-28 22:34:02.000000000 +0200
@@ -33,7 +33,7 @@
"""Determine repo format and build string from remote repository."""
buildre = re.compile(r'.*-Build(.*)')
- factoryre = re.compile(r'openSUSE-(\d*)-i586-x86_64-Build.*')
+ factoryre = re.compile(r'openSUSE-(\d*)-.*-Build.*')
url = urljoin(baseurl, 'media.1/media')
with requests.get(url) as media:
media.encoding = 'utf-8'
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.xlv4a1/_old 2019-08-29 17:25:04.419291949 +0200
+++ /var/tmp/diff_new_pack.xlv4a1/_new 2019-08-29 17:25:04.419291949 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190827.7f92a226
-mtime: 1566913137
-commit: 7f92a226fcba1d6e4626c18479e8d2f79b49174e
+version: 20190828.14971e2d
+mtime: 1567024442
+commit: 14971e2db055eaecb3b8f0486523f09977d6987b
