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

Make the names of the openQA checks unique

Browse Source 
Prefer 'minimal_x' unless there are 2 (the code doesn't
support more than 2)
This commit is contained in:
Stephan Kulow 2018-10-08 20:09:10 +02:00
parent b886e28db3
commit b38a1edc34
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rabbit-openqa.py
View File

@ -19,6 +19,7 @@ except ImportError:
# python 2.x
from urllib2 import HTTPError
class Project(object):
def __init__(self, name):
Config(apiurl, name)
@ -69,14 +70,32 @@ class Project(object):
if not buildid:
print("I don't know the build id of " + staging)
return
# all openQA jobs are created at the same URL
url = self.api.makeurl(['status_reports', 'published', staging, 'images', 'reports', buildid])
openqa = self.listener.jobs_for_iso(iso)
# collect job infos to pick names
openqa_infos = dict()
for job in openqa:
print(staging, iso, job['id'], job['state'], job['result'],
job['settings']['MACHINE'], job['settings']['TEST'])
xml = self.openqa_check_xml(self.listener.test_url(job),
self.map_openqa_result(job),
job['settings']['TEST'] + '@' + job['settings']['MACHINE'])
url = self.api.makeurl(['status_reports', 'published', staging, 'images', 'reports', buildid])
openqa_infos[job['id']] = {'url': self.listener.test_url(job)}
openqa_infos[job['id']]['state'] = self.map_openqa_result(job)
openqa_infos[job['id']]['name'] = job['settings']['TEST']
openqa_infos[job['id']]['machine'] = job['settings']['MACHINE']
# make sure the names are unique
taken_names = dict()
for id in openqa_infos:
name = openqa_infos[id]['name']
if name in taken_names:
openqa_infos[id]['name'] = openqa_infos[id]['name'] + "@" + openqa_infos[id]['machine']
# the other id
id = taken_names[name]
openqa_infos[id]['name'] = openqa_infos[id]['name'] + "@" + openqa_infos[id]['machine']
taken_names[name] = id
for info in openqa_infos.values():
xml = self.openqa_check_xml(info['url'], info['state'], info['name'])
try:
http_POST(url, data=xml)
except HTTPError:
@ -129,6 +148,7 @@ class Project(object):
se.text = name
return ET.tostring(check)
class Listener(object):
def __init__(self, amqp_prefix, amqp_url, openqa_url):
self.projects = []