From 944c53118746b93681db483e365493f696e1d0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 14 Mar 2018 15:30:22 +0100 Subject: [PATCH] [openqa-maintenance] start HA/SES jobs only wheen are required --- data/apimap.json | 3 +++ oqamaint/openqabot.py | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/data/apimap.json b/data/apimap.json index 75493dda..794d2865 100644 --- a/data/apimap.json +++ b/data/apimap.json @@ -100,6 +100,7 @@ "OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:", "HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP3:" }, + "required_issue" : "HA_TEST_ISSUES", "flavor" : "Server-DVD-Incidents-HA", "distri" : "sle", "archs" : [ @@ -113,6 +114,7 @@ "HA_TEST_ISSUES" : "SUSE:Updates:SLE-HA:12-SP2:" }, "flavor" : "Server-DVD-Incidents-HA", + "required_issue" : "HA_TEST_ISSUES", "distri" : "sle", "archs" : [ "x86_64" @@ -124,6 +126,7 @@ "OS_TEST_ISSUES" : "SUSE:Updates:SLE-SERVER:12-SP3:", "SES_TEST_ISSUES" : "SUSE:Updates:Storage:5:" }, + "required_issue" : "SES_TEST_ISSUES", "flavor" : "Server-DVD-SES-Updates", "distri" : "sle", "archs" : [ diff --git a/oqamaint/openqabot.py b/oqamaint/openqabot.py index 2d43e6d8..446f177b 100644 --- a/oqamaint/openqabot.py +++ b/oqamaint/openqabot.py @@ -476,11 +476,16 @@ class OpenQABot(ReviewBot.ReviewBot): settings['DISTRI'] = 'sle' if 'distri' not in pmap else pmap['distri'] issues = pmap.get('issues', {}) issues['OS_TEST_ISSUES'] = issues.get('OS_TEST_ISSUES', product_prefix) + required_issue = pmap.get('required_issue', False) for key, prefix in issues.items(): self.logger.debug("{} {}".format(key, prefix)) if prefix + arch in job['channels']: settings[key] = str(job['id']) need = True + if required_issue: + if required_issue not in settings: + need = False + if need: update = self.project_settings[product_prefix + arch] update.apiurl = self.apiurl