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

Also consider spdx.json an iso for the purpose of openQA

Browse Source 
The SL Micro Maintenance effort has removed isos from staging, which
means there was nothing to trigger openqa on anymore. trigger
on the spdx description instead.
This commit is contained in:
Dirk Mueller 2024-06-21 11:53:37 +02:00
parent 0059b8f24c
commit 7796d974dc
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gocd/rabbit-openqa.py
View File

@ -61,7 +61,7 @@ class Project(object):
return stagingiso return stagingiso
def gather_isos(self, name, repository): def gather_isos(self, name, repository):
ret = [] iso_set = set()
# Fetch /published/prj/repo/iso/*.iso # Fetch /published/prj/repo/iso/*.iso
url = self.api.makeurl(['published', name, repository, 'iso']) url = self.api.makeurl(['published', name, repository, 'iso'])
@ -69,21 +69,21 @@ class Project(object):
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
for entry in root.findall('entry'): for entry in root.findall('entry'):
if entry.get('name').endswith('.iso'): if entry.get('name').endswith('.iso'):
ret.append(self.map_iso(name, entry.get('name'))) iso_set.add(self.map_iso(name, entry.get('name')))
# Fetch /published/prj/repo/iso/*.qcow2 # Fetch /published/prj/repo/*.{qcow2,raw.xz,spdx.json}
url = self.api.makeurl(['published', name, repository]) url = self.api.makeurl(['published', name, repository])
f = self.api.retried_GET(url) f = self.api.retried_GET(url)
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
for entry in root.findall('entry'): for entry in root.findall('entry'):
filename = entry.get('name') filename = entry.get('name')
if filename.endswith('.qcow2') or filename.endswith('.raw.xz'): if (filename.endswith('.qcow2') or
ret.append(self.map_iso(name, filename)) filename.endswith('.raw.xz') or
filename.endswith('.spdx.json')):
iso_set.add(self.map_iso(name, filename))
# Filter out isos which couldn't be mapped # Filter out isos which couldn't be mapped
ret = [iso for iso in ret if iso] return [iso for iso in iso_set if iso]
return ret
def gather_buildid(self, name, repository): def gather_buildid(self, name, repository):
url = self.api.makeurl(['published', name, repository], {'view': 'status'}) url = self.api.makeurl(['published', name, repository], {'view': 'status'})