Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2018-04-07 20:55:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools" Sat Apr 7 20:55:25 2018 rev:79 rq:593997 version:20180406.ace73fe Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2018-04-05 15:35:51.043026903 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2018-04-07 20:55:30.689746959 +0200 @@ -1,0 +2,7 @@ +Fri Apr 06 13:34:09 UTC 2018 - opensuse-releaset...@opensuse.org + +- Update to version 20180406.ace73fe: + * ttm: adjust regexp to include Snapshot + * ttm: fix leap 15 docker image handling + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20180405.e96a27a.obscpio New: ---- openSUSE-release-tools-20180406.ace73fe.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.t05OEj/_old 2018-04-07 20:55:31.761708160 +0200 +++ /var/tmp/diff_new_pack.t05OEj/_new 2018-04-07 20:55:31.761708160 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20180405.e96a27a +Version: 20180406.ace73fe 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.t05OEj/_old 2018-04-07 20:55:31.813706278 +0200 +++ /var/tmp/diff_new_pack.t05OEj/_new 2018-04-07 20:55:31.813706278 +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">a9737a8ace8b2a9286cac4274cf3110b9c1ee83c</param> + <param name="changesrevision">ace73fecaf4995fb8714639901ece1b6d276f570</param> </service> </servicedata> ++++++ openSUSE-release-tools-20180405.e96a27a.obscpio -> openSUSE-release-tools-20180406.ace73fe.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180405.e96a27a/totest-manager.py new/openSUSE-release-tools-20180406.ace73fe/totest-manager.py --- old/openSUSE-release-tools-20180405.e96a27a/totest-manager.py 2018-04-05 11:36:52.000000000 +0200 +++ new/openSUSE-release-tools-20180406.ace73fe/totest-manager.py 2018-04-06 15:28:16.000000000 +0200 @@ -121,7 +121,7 @@ if not base: base = self.project_base for binary in self.binaries_of_product(project, tree): - result = re.match(r'%s.*Build(.*)-Media(.*).iso' % base, binary) + result = re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz)', binary) if result: return result.group(1) raise NotFoundException("can't find %s iso version" % project) @@ -198,8 +198,8 @@ issues = ' , '.join(self.issues_to_ignore) status_flag = 'publishing' if self.status_for_openqa['is_publishing'] else \ 'preparing' if self.status_for_openqa['can_release'] else \ - 'testing' if self.status_for_openqa['snapshotable'] else \ - 'building' + 'testing' if self.status_for_openqa['snapshotable'] else \ + 'building' status_msg = "tag:{}:{}:{}".format(self.status_for_openqa['new_snapshot'], status_flag, status_flag) msg = "pinned-description: Ignored issues\r\n\r\n{}\r\n\r\n{}".format(issues, status_msg) data = {'text': msg} @@ -352,7 +352,11 @@ if re.match(r'.*-ftp-(ftp|POOL)-', package): return None - if ':%s-Addon-NonOss-ftp-ftp' % self.base in package: + # docker container has no size limit + if package == 'opensuse-leap-image': + return None + + if '-Addon-NonOss-ftp-ftp' in package: return None raise Exception('No maxsize for {}'.format(package)) @@ -553,6 +557,12 @@ class ToTestBaseNew(ToTestBase): + # whether all medias need to have the same build number + need_same_build_number = True + + # whether to set a snapshot number on release + set_snapshot_number = False + """Base class for new product builder""" def _release(self, set_release=None): query = {'cmd': 'release'} @@ -594,7 +604,7 @@ def is_snapshottable(self): ret = super(ToTestBaseNew, self).is_snapshottable() - if ret: + if ret and self.need_same_build_number: # make sure all medias have the same build number builds = set() for p in self.ftp_products: @@ -612,8 +622,10 @@ return ret def update_totest(self, snapshot): + if not self.set_snapshot_number: + snapshot = None # omit snapshot, we don't want to rename on release - super(ToTestBaseNew, self).update_totest() + super(ToTestBaseNew, self).update_totest(snapshot) class ToTestFactory(ToTestBase): @@ -764,6 +776,10 @@ livecd_products = [] product_arch = 'x86_64' + # docker image has a different number + need_same_build_number = False + set_snapshot_number = True + def openqa_group(self): return 'openSUSE Leap 15.0 Images' @@ -782,6 +798,7 @@ def jobs_num(self): return 13 + class ToTestSLE150(ToTestBaseNew): main_products = [ '000product:SLES-cd-DVD-aarch64', @@ -881,7 +898,6 @@ if not self.options.obs_api_url: self.options.obs_api_url = self.api_url[self.options.project_base] - def _setup_totest(self, project): fallback_project = 'openSUSE:%s' % project if project not in self.totest_class and fallback_project in self.totest_class: @@ -951,4 +967,3 @@ if __name__ == "__main__": app = CommandlineInterface() sys.exit(app.main()) - ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.t05OEj/_old 2018-04-07 20:55:32.441683549 +0200 +++ /var/tmp/diff_new_pack.t05OEj/_new 2018-04-07 20:55:32.441683549 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20180405.e96a27a -mtime: 1522921012 -commit: e96a27ad7f5162785afb8b1ddffbb935a3afdb2a +version: 20180406.ace73fe +mtime: 1523021296 +commit: ace73fecaf4995fb8714639901ece1b6d276f570