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

[openqa-maintenance] start HA/SES jobs only wheen are required

Browse Source
This commit is contained in:
Ondřej Súkup 2018-03-14 15:30:22 +01:00
parent 8d3d3f4e17
commit 944c531187
No known key found for this signature in database
GPG Key ID: 18E6D11A219AF3B7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/apimap.json
View File

@ -100,6 +100,7 @@
"OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:", "OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:",
"HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP3:" "HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP3:"
}, },
"required_issue" : "HA_TEST_ISSUES",
"flavor" : "Server-DVD-Incidents-HA", "flavor" : "Server-DVD-Incidents-HA",
"distri" : "sle", "distri" : "sle",
"archs" : [ "archs" : [
@ -113,6 +114,7 @@
"HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP2:" "HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP2:"
}, },
"flavor" : "Server-DVD-Incidents-HA", "flavor" : "Server-DVD-Incidents-HA",
"required_issue" : "HA_TEST_ISSUES",
"distri" : "sle", "distri" : "sle",
"archs" : [ "archs" : [
"x86_64" "x86_64"
@ -124,6 +126,7 @@
"OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:", "OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:",
"SES_TEST_ISSUES" : "SUSE:Updates:Storage:5:" "SES_TEST_ISSUES" : "SUSE:Updates:Storage:5:"
}, },
"required_issue" : "SES_TEST_ISSUES",
"flavor" : "Server-DVD-SES-Updates", "flavor" : "Server-DVD-SES-Updates",
"distri" : "sle", "distri" : "sle",
"archs" : [ "archs" : [

5
oqamaint/openqabot.py
View File

@ -476,11 +476,16 @@ class OpenQABot(ReviewBot.ReviewBot):
settings['DISTRI'] = 'sle' if 'distri' not in pmap else pmap['distri'] settings['DISTRI'] = 'sle' if 'distri' not in pmap else pmap['distri']
issues = pmap.get('issues', {}) issues = pmap.get('issues', {})
issues['OS_TEST_ISSUES'] = issues.get('OS_TEST_ISSUES', product_prefix) issues['OS_TEST_ISSUES'] = issues.get('OS_TEST_ISSUES', product_prefix)
required_issue = pmap.get('required_issue', False)
for key, prefix in issues.items(): for key, prefix in issues.items():
self.logger.debug("{} {}".format(key, prefix)) self.logger.debug("{} {}".format(key, prefix))
if prefix + arch in job['channels']: if prefix + arch in job['channels']:
settings[key] = str(job['id']) settings[key] = str(job['id'])
need = True need = True
if required_issue:
if required_issue not in settings:
need = False
if need: if need:
update = self.project_settings[product_prefix + arch] update = self.project_settings[product_prefix + arch]
update.apiurl = self.apiurl update.apiurl = self.apiurl