yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1957 from coolo/fix_ttm

Browse Source 
Fix release of Leap
This commit is contained in:
Stephan Kulow 2019-04-16 16:43:00 +02:00 committed by GitHub
commit 00308ba8ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ttm/publisher.py
View File

@ -176,8 +176,12 @@ class ToTestPublisher(ToTestManager):
group_id = self.openqa_group_id() group_id = self.openqa_group_id()
if self.get_status('publishing') == current_snapshot or self.get_status('published') == current_snapshot: if self.get_status('publishing') == current_snapshot:
self.logger.info('{} is already publishing'.format(current_snapshot)) self.logger.info('{} is already publishing'.format(current_snapshot))
# migrating - if there is no published entry, the last publish call
# didn't wait for publish - and as such didn't set published state
if self.get_status('published') != current_snapshot:
return QAResult.passed
return None return None
current_result = self.overall_result(current_snapshot) current_result = self.overall_result(current_snapshot)

5
ttm/releaser.py
View File

@ -226,8 +226,11 @@ class ToTestReleaser(ToTestManager):
# omit snapshot, we don't want to rename on release # omit snapshot, we don't want to rename on release
if not self.project.set_snapshot_number: if not self.project.set_snapshot_number:
snapshot = None snapshot = None
release = 'Snapshot%s' % snapshot if snapshot else None if snapshot:
release = 'Snapshot%s' % snapshot
self.logger.info('Updating snapshot %s' % snapshot) self.logger.info('Updating snapshot %s' % snapshot)
else:
release = None
if not (self.dryrun or self.project.do_not_release): if not (self.dryrun or self.project.do_not_release):
self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable', self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable',
repository=self.project.product_repo) repository=self.project.product_repo)