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

Merge pull request #996 from mimi1vx/pep8-bot

Browse Source 
openqa-maintenance: Reformat to be more pep8 comfortable
This commit is contained in:
Stephan Kulow 2017-07-08 08:50:06 +02:00 committed by GitHub
commit 1d0a291d09
1 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
openqa-maintenance.py
View File

@ -131,6 +131,7 @@ class Update(object):
return 'unknown' return 'unknown'
class SUSEUpdate(Update): class SUSEUpdate(Update):
def repo_prefix(self): def repo_prefix(self):
@ -205,6 +206,7 @@ class SUSEUpdate(Update):
return settings return settings
class openSUSEUpdate(Update): class openSUSEUpdate(Update):
def calculate_lastest_good_updates(self, openqa, settings): def calculate_lastest_good_updates(self, openqa, settings):
@ -219,9 +221,9 @@ class openSUSEUpdate(Update):
'limit': 100 # this needs increasing if we ever get *monster* coverage for released updates 'limit': 100 # this needs increasing if we ever get *monster* coverage for released updates
})['jobs'] })['jobs']
# check all publishing jobs per build and reject incomplete builds # check all publishing jobs per build and reject incomplete builds
builds = dict() builds = {}
for job in j: for job in j:
if not 'PUBLISH_HDD_1' in job['settings']: if 'PUBLISH_HDD_1' not in job['settings']:
continue continue
if job['result'] == 'passed' or job['result'] == 'softfailed': if job['result'] == 'passed' or job['result'] == 'softfailed':
builds.setdefault(job['settings']['BUILD'], 'passed') builds.setdefault(job['settings']['BUILD'], 'passed')
@ -241,7 +243,7 @@ class openSUSEUpdate(Update):
lastgood_suffix = suffix lastgood_suffix = suffix
elif prefix == lastgood_prefix and suffix > lastgood_suffix: elif prefix == lastgood_prefix and suffix > lastgood_suffix:
lastgood_suffix = suffix lastgood_suffix = suffix
except: except ValueError:
continue continue
if lastgood_prefix: if lastgood_prefix:
@ -263,7 +265,8 @@ class openSUSEUpdate(Update):
# - added packages # - added packages
# - conflicts with installed packages (e.g sendmail vs postfix) # - conflicts with installed packages (e.g sendmail vs postfix)
settings['INSTALL_PACKAGES'] = ' '.join(set([p.name for p in packages])) settings['INSTALL_PACKAGES'] = ' '.join(set([p.name for p in packages]))
settings['VERIFY_PACKAGE_VERSIONS'] = ' '.join(['{} {}-{}'.format(p.name, p.version, p.release) for p in packages]) settings['VERIFY_PACKAGE_VERSIONS'] = ' '.join(
['{} {}-{}'.format(p.name, p.version, p.release) for p in packages])
settings['ZYPPER_ADD_REPOS'] = settings['INCIDENT_REPO'] settings['ZYPPER_ADD_REPOS'] = settings['INCIDENT_REPO']
settings['ADDONURL'] = settings['INCIDENT_REPO'] settings['ADDONURL'] = settings['INCIDENT_REPO']
@ -287,7 +290,7 @@ class TestUpdate(openSUSEUpdate):
PROJECT_OPENQA_SETTINGS = {} PROJECT_OPENQA_SETTINGS = {}
with open(opa.join(data_path, "data/incidents.json"), 'r') as f: with open(opa.join(data_path, "data/incidents.json"), 'r') as f:
for i,j in json.load(f).items(): for i, j in json.load(f).items():
if i.startswith('SUSE'): if i.startswith('SUSE'):
PROJECT_OPENQA_SETTINGS[i] = [SUSEUpdate(k) for k in j] PROJECT_OPENQA_SETTINGS[i] = [SUSEUpdate(k) for k in j]
elif i.startswith('openSUSE'): elif i.startswith('openSUSE'):
@ -394,7 +397,10 @@ class OpenQABot(ReviewBot.ReviewBot):
elif binary.attrib['filename'] == 'updateinfo.xml': elif binary.attrib['filename'] == 'updateinfo.xml':
url = osc.core.makeurl( url = osc.core.makeurl(
self.apiurl, self.apiurl,
('build', a.src_project, a.tgt_project.replace(':', '_'), arch, a.src_package, 'updateinfo.xml')) ('build', a.src_project, a.tgt_project.replace(':', '_'),
arch,
a.src_package,
'updateinfo.xml'))
ui = ET.parse(osc.core.http_GET(url)).getroot() ui = ET.parse(osc.core.http_GET(url)).getroot()
patch_id = ui.find('.//id').text patch_id = ui.find('.//id').text
@ -432,10 +438,10 @@ class OpenQABot(ReviewBot.ReviewBot):
try: try:
ret = self.openqa.openqa_request('POST', 'isos', data=settings, retries=1) ret = self.openqa.openqa_request('POST', 'isos', data=settings, retries=1)
self.logger.info(pformat(ret)) self.logger.info(pformat(ret))
except JSONDecodeError, e: except JSONDecodeError as e:
self.logger.error(e) self.logger.error(e)
# TODO: record error # TODO: record error
except openqa_exceptions.RequestError, e: except openqa_exceptions.RequestError as e:
self.logger.error(e) self.logger.error(e)
return None return None
@ -449,7 +455,8 @@ class OpenQABot(ReviewBot.ReviewBot):
for url in repos: for url in repos:
url += '/repodata/repomd.xml' url += '/repodata/repomd.xml'
root = ET.parse(osc.core.http_GET(url)).getroot() root = ET.parse(osc.core.http_GET(url)).getroot()
cs = root.find('.//{http://linux.duke.edu/metadata/repo}data[@type="primary"]/{http://linux.duke.edu/metadata/repo}checksum') cs = root.find(
'.//{http://linux.duke.edu/metadata/repo}data[@type="primary"]/{http://linux.duke.edu/metadata/repo}checksum')
m.update(cs.text) m.update(cs.text)
return m.hexdigest() return m.hexdigest()
@ -458,10 +465,10 @@ class OpenQABot(ReviewBot.ReviewBot):
get incident numbers from SUSE:Maintenance:Test project get incident numbers from SUSE:Maintenance:Test project
returns dict with openQA var name : string with numbers returns dict with openQA var name : string with numbers
""" """
l_incidents=[] l_incidents = []
for kind, prj in incidents.items(): for kind, prj in incidents.items():
l_incidents.append( l_incidents.append(
( kind + '_TEST_ISSUES', ','.join( (kind + '_TEST_ISSUES', ','.join(
[x.replace('_', '.').split('.')[1] for x in osc.core.meta_get_packagelist(self.apiurl, prj)] [x.replace('_', '.').split('.')[1] for x in osc.core.meta_get_packagelist(self.apiurl, prj)]
))) )))
return l_incidents return l_incidents
@ -484,8 +491,8 @@ class OpenQABot(ReviewBot.ReviewBot):
# if that job doesn't contain the proper hash, we trigger a new one # if that job doesn't contain the proper hash, we trigger a new one
# and then we know the build # and then we know the build
def trigger_build_for_target(self, prj, data): def trigger_build_for_target(self, prj, data):
today=date.today().strftime("%Y%m%d") today = date.today().strftime("%Y%m%d")
repohash=self.calculate_repo_hash(data['repos']) repohash = self.calculate_repo_hash(data['repos'])
buildnr = None buildnr = None
j = self.jobs_for_target(data) j = self.jobs_for_target(data)
for job in j: for job in j:
@ -509,7 +516,7 @@ class OpenQABot(ReviewBot.ReviewBot):
nr = int(build.split('-')[1]) nr = int(build.split('-')[1])
if nr > buildnr: if nr > buildnr:
buildnr = nr buildnr = nr
except: except BaseException:
continue continue
buildnr = "%s-%d" % (today, buildnr + 1) buildnr = "%s-%d" % (today, buildnr + 1)
@ -517,15 +524,15 @@ class OpenQABot(ReviewBot.ReviewBot):
for s in data['settings']: for s in data['settings']:
# now schedule it for real # now schedule it for real
if 'incidents' in data.keys(): if 'incidents' in data.keys():
for x,y in self.calculate_incidents(data['incidents']): for x, y in self.calculate_incidents(data['incidents']):
s[x]=y s[x] = y
s['BUILD'] = buildnr s['BUILD'] = buildnr
s['REPOHASH'] = repohash s['REPOHASH'] = repohash
self.logger.debug(pformat(s)) self.logger.debug(pformat(s))
if not self.dryrun: if not self.dryrun:
try: try:
self.openqa.openqa_request('POST', 'isos', data=s, retries=1) self.openqa.openqa_request('POST', 'isos', data=s, retries=1)
except Exception, e: except Exception as e:
self.logger.debug(e) self.logger.debug(e)
self.update_test_builds[prj] = buildnr self.update_test_builds[prj] = buildnr
@ -701,21 +708,22 @@ class OpenQABot(ReviewBot.ReviewBot):
# this is for humans to decide which incident broke the test repo # this is for humans to decide which incident broke the test repo
jobs += self.request_get_openqa_jobs(req, incident=False, test_repo=True) jobs += self.request_get_openqa_jobs(req, incident=False, test_repo=True)
if self.calculate_qa_status(jobs) == QA_INPROGRESS: if self.calculate_qa_status(jobs) == QA_INPROGRESS:
self.logger.debug("incident tests for request %s are done, but need to wait for test repo", req.reqid) self.logger.debug(
"incident tests for request %s are done, but need to wait for test repo", req.reqid)
return return
groups = dict() groups = dict()
for job in jobs: for job in jobs:
gl = "%s@%s" % (self.emd(job['group']), self.emd(job['settings']['FLAVOR'])) gl = "%s@%s" % (self.emd(job['group']), self.emd(job['settings']['FLAVOR']))
if not gl in groups: if gl not in groups:
groupurl = osc.core.makeurl(self.openqa.baseurl, ['tests', 'overview' ], groupurl = osc.core.makeurl(self.openqa.baseurl, ['tests', 'overview'],
{ 'version': job['settings']['VERSION'], {'version': job['settings']['VERSION'],
'groupid': job['group_id'], 'groupid': job['group_id'],
'flavor': job['settings']['FLAVOR'], 'flavor': job['settings']['FLAVOR'],
'distri': job['settings']['DISTRI'], 'distri': job['settings']['DISTRI'],
'build': job['settings']['BUILD'], 'build': job['settings']['BUILD'],
}) })
groups[gl] = { 'title': "__Group [%s](%s)__\n" % (gl, groupurl), groups[gl] = {'title': "__Group [%s](%s)__\n" % (gl, groupurl),
'passed': 0, 'failed': [] } 'passed': 0, 'failed': []}
job_summary = self.summarize_one_openqa_job(job) job_summary = self.summarize_one_openqa_job(job)
if not len(job_summary): if not len(job_summary):
@ -777,7 +785,8 @@ class CommandLineInterface(ReviewBot.CommandLineInterface):
def get_optparser(self): def get_optparser(self):
parser = ReviewBot.CommandLineInterface.get_optparser(self) parser = ReviewBot.CommandLineInterface.get_optparser(self)
parser.add_option("--force", action="store_true", help="recheck requests that are already considered done") parser.add_option("--force", action="store_true", help="recheck requests that are already considered done")
parser.add_option("--no-comment", dest='comment', action="store_false", default=True, help="don't actually post comments to obs") parser.add_option("--no-comment", dest='comment', action="store_false",
default=True, help="don't actually post comments to obs")
parser.add_option("--openqa", metavar='HOST', help="openqa api host") parser.add_option("--openqa", metavar='HOST', help="openqa api host")
return parser return parser
@ -796,6 +805,7 @@ class CommandLineInterface(ReviewBot.CommandLineInterface):
return bot return bot
if __name__ == "__main__": if __name__ == "__main__":
requests_log = logging.getLogger("requests.packages.urllib3") requests_log = logging.getLogger("requests.packages.urllib3")
requests_log.setLevel(logging.WARNING) requests_log.setLevel(logging.WARNING)