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

Merge pull request #987 from mimi1vx/grr

Browse Source 
openqa-maintenance: dont start KGRAFT jobs in Server-DVD-Incidents
This commit is contained in:
Ondřej Súkup 2017-07-03 21:09:18 +02:00 committed by GitHub
commit f7ca30b848
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openqa-maintenance.py
View File

@ -195,7 +195,6 @@ class SUSEUpdate(Update):
settings['BUILD'] = ':' + req.reqid + name + incident_id
if kgraft_target:
settings['VERSION'] = self.parse_kgraft_version(kgraft_target)
# ignore kgraft patches without defined target
# they are actually only the base for kgraft
if settings['FLAVOR'] == 'KGraft' and kgraft_target and kgraft_target in KGRAFT_SETTINGS:
@ -407,11 +406,17 @@ class OpenQABot(ReviewBot.ReviewBot):
for update in PROJECT_OPENQA_SETTINGS[a.tgt_project]:
settings = update.settings(a.src_project, a.tgt_project, packages, req)
settings['INCIDENT_PATCH'] = patch_id
if settings is not None:
if settings:
# is old style kgraft check if all options correctly set
if settings['FLAVOR'] == 'KGraft' and 'VIRSH_GUESTNAME' not in settings:
self.logger.info("build: {!s} hasn't valid values for kgraft".format(settings['BUILD']))
return None
# don't start KGRAFT job on Server-DVD-Incidents FLAVOR
if settings['FLAVOR'] == 'Server-DVD-Incidents':
if settings['BUILD'].split('.')[1].startswith('kgraft-patch'):
return None
# kernel incidents jobs -- discard all without 'start' = True
if settings['FLAVOR'] == 'Server-DVD-Incidents-Kernel':
if 'start' in settings: