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

Merge pull request #3098 from Vogtinator/resultoptim

Browse Source 
Make ttm release faster and errors more useful
This commit is contained in:
Fabian Vogt 2024-06-03 15:26:50 +02:00 committed by GitHub
commit cba9d9b507
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ttm/releaser.py
View File

@ -94,25 +94,20 @@ class ToTestReleaser(ToTestManager):
# Other types don't have a fixed size limit # Other types don't have a fixed size limit
return None return None
def package_ok(self, project, package, repository, arch): def package_ok(self, prjresult, project, package, repository, arch):
"""Checks one package in a project and returns True if it's succeeded """Checks one package in a project and returns True if it's succeeded"""
""" status = prjresult.xpath(f'result[@repository="{repository}"][@arch="{arch}"]/'
f'status[@package="{package}"]')
query = {'package': package, 'repository': repository, 'arch': arch} failed = [s for s in status if s.get('code') != 'succeeded']
if len(failed):
url = self.api.makeurl(['build', project, '_result'], query)
f = self.api.retried_GET(url)
root = ET.parse(f).getroot()
# [@code!='succeeded'] is not supported by ET
failed = [status for status in root.findall('result/status') if status.get('code') != 'succeeded']
if any(failed):
self.logger.info( self.logger.info(
f"{project} {package} {repository} {arch} -> {failed[0].get('code')}") f"{project} {package} {repository} {arch} -> {failed[0].get('code')}")
return False return False
if not len(root.findall('result/status[@code="succeeded"]')): succeeded = [s for s in status if s.get('code') == 'succeeded']
if not len(succeeded):
self.logger.info(f'No "succeeded" for {project} {package} {repository} {arch}') self.logger.info(f'No "succeeded" for {project} {package} {repository} {arch}')
return False return False
@ -205,29 +200,40 @@ class ToTestReleaser(ToTestManager):
if not self.all_repos_done(self.project.name): if not self.all_repos_done(self.project.name):
return False return False
all_ok = True
resultxml = self.api.retried_GET(self.api.makeurl(['build', self.project.name, '_result']))
prjresult = ET.parse(resultxml).getroot()
for product in self.project.ftp_products + self.project.main_products: for product in self.project.ftp_products + self.project.main_products:
if not self.package_ok(self.project.name, product, self.project.product_repo, self.project.product_arch): if not self.package_ok(prjresult, self.project.name, product, self.project.product_repo, self.project.product_arch):
return False all_ok = False
for product in self.project.image_products + self.project.container_products: for product in self.project.image_products + self.project.container_products:
for arch in product.archs: for arch in product.archs:
if not self.package_ok(self.project.name, product.package, self.project.product_repo, arch): if not self.package_ok(prjresult, self.project.name, product.package, self.project.product_repo, arch):
return False all_ok = False
for product in self.project.containerfile_products: for product in self.project.containerfile_products:
for arch in product.archs: for arch in product.archs:
if not self.package_ok(self.project.name, product.package, 'containerfile', arch): if not self.package_ok(prjresult, self.project.name, product.package, 'containerfile', arch):
return False all_ok = False
if len(self.project.livecd_products): if len(self.project.livecd_products):
if not self.all_repos_done(f'{self.project.name}:Live'): liveprjname = f'{self.project.name}:Live'
if not self.all_repos_done(liveprjname):
return False return False
liveresultxml = self.api.retried_GET(self.api.makeurl(['build', liveprjname, '_result']))
liveprjresult = ET.parse(liveresultxml).getroot()
for product in self.project.livecd_products: for product in self.project.livecd_products:
for arch in product.archs: for arch in product.archs:
if not self.package_ok(f'{self.project.name}:Live', product.package, if not self.package_ok(liveprjresult, liveprjname, product.package,
self.project.product_repo, arch): self.project.product_repo, arch):
return False all_ok = False
if not all_ok:
return False
# The FTP tree isn't released with setrelease, so it needs to contain # The FTP tree isn't released with setrelease, so it needs to contain
# the product version already. # the product version already.