Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-03-06 15:51:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Mar 6 15:51:02 2019 rev:166 rq:682027 version:20190305.9f97c15
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-02-24 17:19:37.744405356 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28833/openSUSE-release-tools.changes
2019-03-06 15:51:24.936435685 +0100
@@ -1,0 +2,44 @@
+Wed Mar 06 08:23:43 UTC 2019 - [email protected]
+
+- Update to version 20190305.9f97c15:
+ * cycle: Add command line parameter support
+ * Use the JeOS-efi binaries for 15.1 arm images version reading
+ * Use different base class for ToTest151ARMImages
+ * Add openSUSE:Leap:15.1:ARM:Images
+
+-------------------------------------------------------------------
+Wed Feb 27 22:23:26 UTC 2019 - [email protected]
+
+- Update to version 20190227.214f8bb:
+ * origin-manager: support ReviewBot override comment using origin workaround.
+ * ReviewBot: request_override_check(): default to accept.
+ * ReviewBot: request_override_check(): provide force option.
+
+-------------------------------------------------------------------
+Wed Feb 27 12:22:45 UTC 2019 - [email protected]
+
+- Update to version 20190227.b16cc9a:
+ * Add openSUSE-Tumbleweed-Kubic images
+
+-------------------------------------------------------------------
+Wed Feb 27 08:02:57 UTC 2019 - [email protected]
+
+- Update to version 20190227.ca7c4fd:
+ * legal: Fix crash on declining obsrq#670770
+
+-------------------------------------------------------------------
+Tue Feb 26 14:52:21 UTC 2019 - [email protected]
+
+- Update to version 20190226.6d72812:
+ * dist/package: include origin-manager source file in source_dir.
+ * dist/kubernetes: disable origin-manager component.
+ * dist/kubernetes: add origin-manager component.
+ * dist/kiwi: add origin-manager subpackage.
+
+-------------------------------------------------------------------
+Fri Feb 22 10:35:48 UTC 2019 - [email protected]
+
+- Update to version 20190222.9b58ce5:
+ * Fix project/status route
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190221.324b92a.obscpio
New:
----
openSUSE-release-tools-20190305.9f97c15.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.SXlQ67/_old 2019-03-06 15:51:28.844434899 +0100
+++ /var/tmp/diff_new_pack.SXlQ67/_new 2019-03-06 15:51:28.844434899 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190221.324b92a
+Version: 20190305.9f97c15
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
@@ -594,6 +594,7 @@
%files origin-manager
%{_bindir}/osrt-origin-manager
+%{_datadir}/%{source_dir}/origin-manager.py
%{_unitdir}/osrt-origin-manager.service
%{_unitdir}/osrt-origin-manager.timer
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.SXlQ67/_old 2019-03-06 15:51:28.876434892 +0100
+++ /var/tmp/diff_new_pack.SXlQ67/_new 2019-03-06 15:51:28.876434892 +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">0e6951e653f9ee586cb71559de6b8422da721d25</param>
+ <param
name="changesrevision">9f97c150b8efc516cc5f824771be3b667db6f5ab</param>
</service>
-</servicedata>
+</servicedata>
\ No newline at end of file
++++++ openSUSE-release-tools-20190221.324b92a.obscpio ->
openSUSE-release-tools-20190305.9f97c15.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20190221.324b92a/ReviewBot.py
new/openSUSE-release-tools-20190305.9f97c15/ReviewBot.py
--- old/openSUSE-release-tools-20190221.324b92a/ReviewBot.py 2019-02-21
19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/ReviewBot.py 2019-03-05
16:44:43.000000000 +0100
@@ -210,9 +210,9 @@
return users
- def request_override_check(self, request):
+ def request_override_check(self, request, force=False):
"""Check for a comment command requesting review override."""
- if not self.override_allow:
+ if not force and not self.override_allow:
return None
comments = self.comment_api.get_comments(request_id=request.reqid)
@@ -220,7 +220,7 @@
for args, who in self.comment_api.command_find(
comments, self.review_user, 'override', users):
message = 'overridden by {}'.format(who)
- override = args[1] or None
+ override = args[1] if len(args) >= 2 else 'accept'
if override == 'accept':
self.review_messages['accepted'] = message
return True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/build-fail-reminder.py
new/openSUSE-release-tools-20190305.9f97c15/build-fail-reminder.py
--- old/openSUSE-release-tools-20190221.324b92a/build-fail-reminder.py
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/build-fail-reminder.py
2019-03-05 16:44:43.000000000 +0100
@@ -19,7 +19,7 @@
Charset.add_charset('utf-8', Charset.QP, Charset.QP, 'utf-8')
# FIXME: compute from apiurl
-URL="https://build.opensuse.org/project/status?&project=%s&ignore_pending=true&limit_to_fails=true&include_versions=false&format=json";
+URL="https://build.opensuse.org/project/status/%s?ignore_pending=true&limit_to_fails=true&include_versions=false&format=json";
# for maintainer search
FACTORY='openSUSE:Factory'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/dist/kiwi/osrt-worker-obs.kiwi
new/openSUSE-release-tools-20190305.9f97c15/dist/kiwi/osrt-worker-obs.kiwi
--- old/openSUSE-release-tools-20190221.324b92a/dist/kiwi/osrt-worker-obs.kiwi
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/dist/kiwi/osrt-worker-obs.kiwi
2019-03-05 16:44:43.000000000 +0100
@@ -22,6 +22,7 @@
<package name="openSUSE-release-tools-check-source"/>
<package name="openSUSE-release-tools-leaper"/>
<package name="openSUSE-release-tools-obs-operator"/>
+ <package name="openSUSE-release-tools-origin-manager"/>
<package name="openSUSE-release-tools-pkglistgen"/>
<package name="openSUSE-release-tools-repo-checker"/>
<package name="openSUSE-release-tools-staging-bot"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/app.yaml
new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/app.yaml
--- old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/app.yaml
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/app.yaml
2019-03-05 16:44:43.000000000 +0100
@@ -9,6 +9,7 @@
targets:
#- check-source
- obs-operator
+ #- origin-manager
#- repo-checker
kind: ksonnet.io/app
name: openSUSE-release-tools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/components/origin-manager/params.libsonnet
new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/components/origin-manager/params.libsonnet
---
old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/components/origin-manager/params.libsonnet
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/components/origin-manager/params.libsonnet
2019-03-05 16:44:43.000000000 +0100
@@ -0,0 +1,13 @@
+{
+ global: {
+ cpu: "100m",
+ memory: "128Mi",
+ cache: "100Mi",
+ image: null,
+ prefix: "origin-manager",
+ },
+ components: {
+ review: {
+ },
+ },
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/components/origin-manager/review.jsonnet
new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/components/origin-manager/review.jsonnet
---
old/openSUSE-release-tools-20190221.324b92a/dist/kubernetes/components/origin-manager/review.jsonnet
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190305.9f97c15/dist/kubernetes/components/origin-manager/review.jsonnet
2019-03-05 16:44:43.000000000 +0100
@@ -0,0 +1,12 @@
+local params = std.extVar("__ksonnet/params").components.review;
+local review_bot = import '../review_bot.libsonnet';
+
+[
+ review_bot.parts.cache.base(
+ params.prefix, params.cache),
+
+ review_bot.parts.cron.base(
+ params.prefix, "review",
+ "*/5 * * * *", params.cpu, params.memory, params.image,
+ "osrt-origin-manager --debug review"),
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20190305.9f97c15/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20190221.324b92a/dist/package/openSUSE-release-tools.spec
2019-02-21 19:08:06.000000000 +0100
+++
new/openSUSE-release-tools-20190305.9f97c15/dist/package/openSUSE-release-tools.spec
2019-03-05 16:44:43.000000000 +0100
@@ -594,6 +594,7 @@
%files origin-manager
%{_bindir}/osrt-origin-manager
+%{_datadir}/%{source_dir}/origin-manager.py
%{_unitdir}/osrt-origin-manager.service
%{_unitdir}/osrt-origin-manager.timer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/legal-auto.py
new/openSUSE-release-tools-20190305.9f97c15/legal-auto.py
--- old/openSUSE-release-tools-20190221.324b92a/legal-auto.py 2019-02-21
19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/legal-auto.py 2019-03-05
16:44:43.000000000 +0100
@@ -128,7 +128,7 @@
self.message = 'declined'
print("unacceptable without user %d" % report.get('id'))
return None
- comment = report.get('result', None)
+ comment = report.get('result', None).encode('utf-8')
if comment:
self.message = "@{} declined the legal report with the
following comment: {}".format(
user, comment)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/origin-manager.py
new/openSUSE-release-tools-20190305.9f97c15/origin-manager.py
--- old/openSUSE-release-tools-20190221.324b92a/origin-manager.py
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/origin-manager.py
2019-03-05 16:44:43.000000000 +0100
@@ -15,8 +15,6 @@
# ReviewBot options.
self.request_default_return = True
- # No such thing as override, only changing origin which must be
approved
- # by fallback group. Annotation must be included in review.
self.override_allow = False
def check_source_submission(self, src_project, src_package, src_rev,
tgt_project, tgt_package):
@@ -55,7 +53,15 @@
self.policy_result_comment_add(project, package, result.comments)
- if not result.wait:
+ if result.wait:
+ # Allow overriding a policy wait by accepting as workaround with
the
+ # hope that pending request will be accepted.
+ override = self.request_override_check(self.request, True)
+ if override:
+ self.review_messages['accepted'] = origin_annotation_dump(
+ origin_info_new, origin_info_old,
self.review_messages['accepted'])
+ return override
+ else:
if result.accept:
self.review_messages['accepted'] =
origin_annotation_dump(origin_info_new, origin_info_old)
return result.accept
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20190221.324b92a/osc-cycle.py
new/openSUSE-release-tools-20190305.9f97c15/osc-cycle.py
--- old/openSUSE-release-tools-20190221.324b92a/osc-cycle.py 2019-02-21
19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/osc-cycle.py 2019-03-05
16:44:43.000000000 +0100
@@ -1,7 +1,11 @@
import osc.core
from osc.core import get_dependson
from xml.etree import cElementTree as ET
+from osc import cmdln
[email protected]('-p', '--project', metavar='PROJECT', dest='project',
default='openSUSE:Factory')
[email protected]('-r', '--repository', metavar='REPOSITORY', dest='repository',
default='standard')
[email protected]('-a', '--arch', metavar='ARCH', dest='arch', default='x86_64')
def do_cycle(self, subcmd, opts, *args):
"""${cmd_name}: Try to visualize build dependencies between the package
list specified
@@ -19,7 +23,7 @@
args = [pkg.strip() for pkglist in args for pkg in pkglist.split(',') if
pkg.strip()]
for pkgname in args:
try:
- deps = ET.fromstring(get_dependson(apiurl, "openSUSE:Factory",
"standard", "x86_64", [pkgname]))
+ deps = ET.fromstring(get_dependson(apiurl, opts.project,
opts.repository, opts.arch, [pkgname]))
pkg = deps.find('package')
print ("\"%s\"" % pkgname)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/osclib/origin.py
new/openSUSE-release-tools-20190305.9f97c15/osclib/origin.py
--- old/openSUSE-release-tools-20190221.324b92a/osclib/origin.py
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/osclib/origin.py
2019-03-05 16:44:43.000000000 +0100
@@ -291,11 +291,15 @@
return None
-def origin_annotation_dump(origin_info_new, origin_info_old):
+def origin_annotation_dump(origin_info_new, origin_info_old, override=False):
data = {'origin': str(origin_info_new.project)}
if origin_info_old and origin_info_new.project != origin_info_old.project:
data['origin_old'] = str(origin_info_old.project)
+ if override:
+ data['origin'] = origin_workaround_ensure(data['origin'])
+ data['comment'] = override
+
return yaml.dump(data, default_flow_style=False)
def origin_annotation_load(annotation):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190221.324b92a/totest-manager.py
new/openSUSE-release-tools-20190305.9f97c15/totest-manager.py
--- old/openSUSE-release-tools-20190221.324b92a/totest-manager.py
2019-02-21 19:08:06.000000000 +0100
+++ new/openSUSE-release-tools-20190305.9f97c15/totest-manager.py
2019-03-05 16:44:43.000000000 +0100
@@ -160,7 +160,7 @@
if not base:
base = self.project_base
for binary in self.binaries_of_product(project, tree, repo=repo,
arch=arch):
- result =
re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz)',
binary)
+ result =
re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz|\.raw\.xz)',
binary)
if result:
return result.group(1)
raise NotFoundException("can't find %s iso version" % project)
@@ -402,14 +402,14 @@
if re.match(r'.*-ftp-(ftp|POOL)-', package):
return None
- # docker container has no size limit
- if re.match(r'opensuse-.*-image.*', package):
+ # containers have no size limit
+ if re.match(r'(opensuse|kubic)-.*-image.*', package):
return None
if '-Addon-NonOss-ftp-ftp' in package:
return None
- if 'JeOS' in package:
+ if 'JeOS' in package or 'Kubic' in package:
return 4700372992
raise Exception('No maxsize for {}'.format(package))
@@ -781,6 +781,11 @@
ImageProduct('openSUSE-Tumbleweed-JeOS:VMware', ['x86_64']),
ImageProduct('openSUSE-Tumbleweed-JeOS:XEN', ['x86_64']),
ImageProduct('openSUSE-Tumbleweed-JeOS:kvm-and-xen', ['x86_64']),
+ ] + [
+ ImageProduct('openSUSE-Tumbleweed-Kubic:' + flavor + '-' + platform,
['x86_64'])
+ for platform in
+ ['MS-HyperV', 'OpenStack-Cloud', 'VMware', 'Vagrant-x86_64', 'XEN',
'hardware-x86_64', 'kvm-and-xen']
+ for flavor in ['MicroOS-podman', 'kubeadm-cri-o']
]
def __init__(self, *args, **kwargs):
@@ -1022,6 +1027,23 @@
def openqa_group(self):
return 'openSUSE Leap 15.1 Images'
+class ToTest151ARMImages(ToTest151Images):
+ # JeOS uses multibuild, but listing all flavors here would be too much.
Instead, list
+ # the multibuild container itself, which releases all binaries.
+ image_products = [ImageProduct('JeOS:JeOS-efi.aarch64', ['aarch64']),
+ ImageProduct('JeOS', ['armv7l'])]
+
+ container_products = [ImageProduct('opensuse-leap-image:docker',
['aarch64'])]
+
+ def openqa_group(self):
+ return 'openSUSE Leap 15.1 AArch64 Images'
+
+ def _release(self, set_release=None):
+ ToTestBase._release(self, set_release)
+
+ def jobs_num(self):
+ return 2
+
class ToTestSLE(ToTestBaseNew):
def __init__(self, *args, **kwargs):
@@ -1087,6 +1109,7 @@
'openSUSE:Leap:15.0:Ports': ToTest150Ports,
'openSUSE:Leap:15.0:Images': ToTest150Images,
'openSUSE:Leap:15.1:Images': ToTest151Images,
+ 'openSUSE:Leap:15.1:ARM:Images': ToTest151ARMImages,
'SUSE:SLE-12-SP4:GA': ToTestSLE12,
'SUSE:SLE-15:GA': ToTestSLE15,
'SUSE:SLE-15-SP1:GA': ToTestSLE15,
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.SXlQ67/_old 2019-03-06 15:51:29.300434807 +0100
+++ /var/tmp/diff_new_pack.SXlQ67/_new 2019-03-06 15:51:29.304434807 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190221.324b92a
-mtime: 1550772486
-commit: 324b92a0a5a9f5d30584e670ee1a082d830a71da
+version: 20190305.9f97c15
+mtime: 1551800683
+commit: 9f97c150b8efc516cc5f824771be3b667db6f5ab
