Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-02-25 11:48:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Sun Feb 25 11:48:21 2018 rev:62 rq:579843 version:20180223.e8c002d
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-02-23 15:31:42.118395285 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-02-25 11:53:10.507077691 +0100
@@ -1,0 +2,9 @@
+Fri Feb 23 09:17:50 UTC 2018 - [email protected]
+
+- Update to version 20180223.e8c002d:
+ * ttm: handle Leap 15 live images separately
+ * requestfinder: make sure exclude-project is a list
+ * requestfinder: fix exclude-user and add exclude-group
+ * leaper: allow turning FORK into something else
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180223.af01909.obscpio
New:
----
openSUSE-release-tools-20180223.e8c002d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.n8x9tm/_old 2018-02-25 11:53:11.507041390 +0100
+++ /var/tmp/diff_new_pack.n8x9tm/_new 2018-02-25 11:53:11.511041246 +0100
@@ -20,7 +20,7 @@
%define source_dir osc-plugin-factory
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180223.af01909
+Version: 20180223.e8c002d
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.n8x9tm/_old 2018-02-25 11:53:11.559039503 +0100
+++ /var/tmp/diff_new_pack.n8x9tm/_new 2018-02-25 11:53:11.563039358 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/osc-plugin-factory.git</param>
- <param
name="changesrevision">893104b7e45beac46ffcf42a74beaa1fddb79b86</param>
+ <param
name="changesrevision">e8c002d37b4b21b73197ae413e973aee76d7e994</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180223.af01909.obscpio ->
openSUSE-release-tools-20180223.e8c002d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180223.af01909/leaper.py
new/openSUSE-release-tools-20180223.e8c002d/leaper.py
--- old/openSUSE-release-tools-20180223.af01909/leaper.py 2018-02-23
09:32:36.000000000 +0100
+++ new/openSUSE-release-tools-20180223.e8c002d/leaper.py 2018-02-23
10:01:10.000000000 +0100
@@ -242,8 +242,8 @@
is_fine_if_factory = True
# fall through to check history and requests
elif origin == 'FORK':
+ is_fine_if_factory = True
if not src_project.startswith('SUSE:SLE-'):
- is_fine_if_factory = True
not_in_factory_okish = True
self.needs_check_source = True
self.needs_release_manager = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180223.af01909/requestfinder.py
new/openSUSE-release-tools-20180223.e8c002d/requestfinder.py
--- old/openSUSE-release-tools-20180223.af01909/requestfinder.py
2018-02-23 09:32:36.000000000 +0100
+++ new/openSUSE-release-tools-20180223.e8c002d/requestfinder.py
2018-02-23 10:01:10.000000000 +0100
@@ -123,6 +123,7 @@
'query': None,
'exclude-project': None,
'exclude-user': None,
+ 'exclude-group': None,
}
if opts.settings:
@@ -154,7 +155,7 @@
if review.by_project:
skip = False
if settings['exclude-project']:
- for p in settings['exclude-project']:
+ for p in settings['exclude-project'].split(' '):
if review.by_project.startswith(p):
skip = True
break
@@ -164,11 +165,20 @@
else:
print("osc review %s -m '%s' -P %s %s" %
(settings['action'], settings['message'], review.by_project, r.reqid))
elif review.by_group:
- print("osc review %s -m '%s' -G %s %s" %
(settings['action'], settings['message'], review.by_group, r.reqid))
+ skip = False
+ if settings['exclude-group']:
+ groups = settings['exclude-group'].split(' ')
+ for g in groups:
+ if review.by_group == g:
+ skip = True
+ break
+ if not skip:
+ print("osc review %s -m '%s' -G %s %s" %
(settings['action'], settings['message'], review.by_group, r.reqid))
elif review.by_user:
skip = False
if settings['exclude-user']:
- for u in settings['exclude-user']:
+ users = settings['exclude-user'].split(' ')
+ for u in users:
if review.by_user == u:
skip = True
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180223.af01909/totest-manager.py
new/openSUSE-release-tools-20180223.e8c002d/totest-manager.py
--- old/openSUSE-release-tools-20180223.af01909/totest-manager.py
2018-02-23 09:32:36.000000000 +0100
+++ new/openSUSE-release-tools-20180223.e8c002d/totest-manager.py
2018-02-23 10:01:10.000000000 +0100
@@ -46,6 +46,11 @@
"""Base class to store the basic interface"""
+ product_repo = 'images'
+ product_arch = 'local'
+ livecd_repo = 'images'
+ livecd_archs = ['i586', 'x86_64']
+
def __init__(self, project, dryrun=False, api_url=None,
openqa_server='https://openqa.opensuse.org', test_subproject=None):
self.project = project
self.dryrun = dryrun
@@ -79,7 +84,7 @@
return self.release_version()
def binaries_of_product(self, project, product):
- url = self.api.makeurl(['build', project, 'images', 'local', product])
+ url = self.api.makeurl(['build', project, self.product_repo,
self.product_arch, product])
try:
f = self.api.retried_GET(url)
except urllib2.HTTPError:
@@ -134,6 +139,9 @@
raise NotFoundException("can't find %s version" % self.project)
+ def current_qa_version(self):
+ return self.api.dashboard_content_load('version_totest')
+
def find_openqa_results(self, snapshot):
"""Return the openqa jobs of a given snapshot and filter out the
cloned jobs
@@ -393,7 +401,7 @@
return False
for product in self.ftp_products + self.main_products:
- if not self.package_ok(self.project, product, 'images', 'local'):
+ if not self.package_ok(self.project, product, self.product_repo,
self.product_arch):
return False
if len(self.livecd_products):
@@ -401,9 +409,9 @@
if not self.all_repos_done('%s:Live' % self.project):
return False
- for arch in ['i586', 'x86_64']:
+ for arch in self.livecd_archs:
for product in self.livecd_products:
- if not self.package_ok('%s:Live' % self.project,
product, 'images', arch):
+ if not self.package_ok('%s:Live' % self.project,
product, self.livecd_repo, arch):
return False
return True
@@ -479,7 +487,7 @@
new_snapshot = self.current_version()
self.update_pinned_descr = False
current_result = self.overall_result(current_snapshot)
- current_qa_version = self.api.dashboard_content_load('version_totest')
+ current_qa_version = self.current_qa_version()
logger.info('current_snapshot %s: %s' %
(current_snapshot, self._result2str(current_result)))
@@ -488,7 +496,7 @@
snapshotable = self.is_snapshottable()
logger.debug("snapshotable: %s", snapshotable)
- can_release = (current_result != QA_INPROGRESS and snapshotable)
+ can_release = ((current_snapshot is None or current_result !=
QA_INPROGRESS) and snapshotable)
# not overwriting
if new_snapshot == current_snapshot:
@@ -600,6 +608,8 @@
builds.add(self.iso_build_version(self.project, p))
ret = (len(builds) == 1)
+ if ret is False:
+ logger.debug("not all medias have the same build number")
return ret
@@ -743,6 +753,35 @@
return self.iso_build_version(self.project + ':ToTest',
self.main_products[0])
+class ToTest150Images(ToTestBaseNew):
+ main_products = [
+ 'livecd-leap-gnome',
+ 'livecd-leap-kde',
+ 'livecd-leap-x11',
+ ]
+
+ ftp_products = []
+
+ livecd_products = []
+ product_arch = 'x86_64'
+
+ def openqa_group(self):
+ return 'openSUSE Leap 15.0 Images'
+
+ def current_qa_version(self):
+ return self.api.dashboard_content_load('version_totest_images')
+
+ def write_version_to_dashboard(self, target, version):
+ super(ToTest150Images,
self).write_version_to_dashboard('{}_images'.format(target), version)
+
+ def get_current_snapshot(self):
+ return self.iso_build_version(self.project + ':ToTest',
self.main_products[0])
+
+ def _release(self, set_release=None):
+ ToTestBase._release(self, set_release)
+
+ def jobs_num(self):
+ return 13
class ToTestSLE150(ToTestBaseNew):
main_products = [
@@ -789,6 +828,7 @@
'openSUSE:Factory:zSystems': ToTestFactoryzSystems,
'openSUSE:Leap:15.0': ToTest150,
'openSUSE:Leap:15.0:Ports': ToTest150Ports,
+ 'openSUSE:Leap:15.0:Images': ToTest150Images,
'SUSE:SLE-15:GA': ToTestSLE150,
}
self.openqa_server = {
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.n8x9tm/_old 2018-02-25 11:53:12.307012351 +0100
+++ /var/tmp/diff_new_pack.n8x9tm/_new 2018-02-25 11:53:12.311012205 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180223.af01909
-mtime: 1519374756
-commit: af0190975efc863ad628d2e7ba17c3ca021c519a
+version: 20180223.e8c002d
+mtime: 1519376470
+commit: e8c002d37b4b21b73197ae413e973aee76d7e994
