From 7796d974dc14216e87928ada5d78a9e90c2d6697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 21 Jun 2024 11:53:37 +0200 Subject: [PATCH] Also consider spdx.json an iso for the purpose of openQA 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. --- gocd/rabbit-openqa.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gocd/rabbit-openqa.py b/gocd/rabbit-openqa.py index f304e89f..78f420d1 100755 --- a/gocd/rabbit-openqa.py +++ b/gocd/rabbit-openqa.py @@ -61,7 +61,7 @@ class Project(object): return stagingiso def gather_isos(self, name, repository): - ret = [] + iso_set = set() # Fetch /published/prj/repo/iso/*.iso url = self.api.makeurl(['published', name, repository, 'iso']) @@ -69,21 +69,21 @@ class Project(object): root = ET.parse(f).getroot() for entry in root.findall('entry'): 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]) f = self.api.retried_GET(url) root = ET.parse(f).getroot() for entry in root.findall('entry'): filename = entry.get('name') - if filename.endswith('.qcow2') or filename.endswith('.raw.xz'): - ret.append(self.map_iso(name, filename)) + if (filename.endswith('.qcow2') or + 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 - ret = [iso for iso in ret if iso] - - return ret + return [iso for iso in iso_set if iso] def gather_buildid(self, name, repository): url = self.api.makeurl(['published', name, repository], {'view': 'status'})