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

Fix variable name

Browse Source
This commit is contained in:
Stephan Kulow 2017-07-25 15:27:36 +02:00
parent 4eca0cddc2
commit 032aa5b4ff
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/apimap.json
View File

@ -10,7 +10,7 @@
}, },
"SUSE:Updates:SLE-DESKTOP:12-SP2:" : { "SUSE:Updates:SLE-DESKTOP:12-SP2:" : {
"issues" : { "issues" : {
"SDK_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP2:" "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP2:"
}, },
"version" : "12-SP2", "version" : "12-SP2",
"flavor" : "Desktop-DVD-Incidents", "flavor" : "Desktop-DVD-Incidents",
@ -29,11 +29,11 @@
}, },
"SUSE:Updates:SLE-SERVER:12-SP3:" : { "SUSE:Updates:SLE-SERVER:12-SP3:" : {
"issues" : { "issues" : {
"WE_ISSUES" : "SUSE:Updates:SLE-WE:12-SP3:", "WE_TEST_ISSUES" : "SUSE:Updates:SLE-WE:12-SP3:",
"TCM_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:", "TCM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:",
"HPCM_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:", "HPCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:",
"SDK_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP3:", "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP3:",
"WSM_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:" "WSM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:"
}, },
"flavor" : "Server-DVD-Incidents", "flavor" : "Server-DVD-Incidents",
"version" : "12-SP3", "version" : "12-SP3",
@ -47,7 +47,7 @@
"SUSE:Updates:SLE-DESKTOP:12-SP3:" : { "SUSE:Updates:SLE-DESKTOP:12-SP3:" : {
"version" : "12-SP3", "version" : "12-SP3",
"issues" : { "issues" : {
"SDK_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP3:" "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP3:"
}, },
"flavor" : "Desktop-DVD-Incidents", "flavor" : "Desktop-DVD-Incidents",
"archs" : [ "archs" : [
@ -57,11 +57,11 @@
"SUSE:Updates:SLE-SERVER:12-SP2:" : { "SUSE:Updates:SLE-SERVER:12-SP2:" : {
"version" : "12-SP2", "version" : "12-SP2",
"issues" : { "issues" : {
"WE_ISSUES" : "SUSE:Updates:SLE-WE:12-SP2:", "WE_TEST_ISSUES" : "SUSE:Updates:SLE-WE:12-SP2:",
"TCM_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:", "TCM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:",
"SDK_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP2:", "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP2:",
"HPCM_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:", "HPCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:",
"WSM_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:" "WSM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:"
}, },
"flavor" : "Server-DVD-Incidents", "flavor" : "Server-DVD-Incidents",
"archs" : [ "archs" : [

9
openqa-maintenance.py
View File

@ -858,7 +858,7 @@ class OpenQABot(ReviewBot.ReviewBot):
need = False need = False
settings = {'FLAVOR': pmap['flavor'], 'VERSION': pmap['version'], 'ARCH': arch, 'DISTRI': 'sle'} settings = {'FLAVOR': pmap['flavor'], 'VERSION': pmap['version'], 'ARCH': arch, 'DISTRI': 'sle'}
issues = pmap.get('issues', {}) issues = pmap.get('issues', {})
issues['OS_ISSUES'] = product_prefix issues['OS_TEST_ISSUES'] = product_prefix
for key, prefix in issues.items(): for key, prefix in issues.items():
if prefix + arch in job['channels']: if prefix + arch in job['channels']:
settings[key] = str(job['id']) settings[key] = str(job['id'])
@ -879,7 +879,10 @@ class OpenQABot(ReviewBot.ReviewBot):
def test(self): def test(self):
for inc in requests.get('https://maintenance.suse.de/api/incident/active/').json(): for inc in requests.get('https://maintenance.suse.de/api/incident/active/').json():
if not inc in ['a4871', 'a5146', 'a2129', 'a5219', '5230']: continue if not inc in ['a4871', 'a5146', 'a2129', '5219', '5217', '5230']: continue
#if not inc.startswith('52'): continue
print inc
#continue
job = requests.get('https://maintenance.suse.de/api/incident/' + inc).json() job = requests.get('https://maintenance.suse.de/api/incident/' + inc).json()
if job['meta']['state'] in ['final', 'gone']: if job['meta']['state'] in ['final', 'gone']:
continue continue
@ -910,7 +913,7 @@ class OpenQABot(ReviewBot.ReviewBot):
else: else:
print s, 'got', len(jobs) print s, 'got', len(jobs)
openqa_jobs += jobs openqa_jobs += jobs
if not openqa_done: if not openqa_done or len(openqa_jobs) == 0:
continue continue
#print openqa_jobs #print openqa_jobs
msg = self.summarize_openqa_jobs(openqa_jobs) msg = self.summarize_openqa_jobs(openqa_jobs)