use koji module in place of koji cli

glehmann · glehmann · commit 3aa6e0e9ced0 · 2025-03-05T17:10:00.000+01:00
Signed-off-by: Gaëtan Lehmann &lt;gaetan.lehmann@vates.tech&gt;
diff --git a/scripts/pkg_in_pipe.py b/scripts/pkg_in_pipe.py
@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 
 import os
-import re
-from multiprocessing.pool import ThreadPool
-from subprocess import check_output
 
+import koji
 import requests
 
-# export VER=8.2; for t in incoming ci testing candidates lab; do echo "\*\*\* v$VER-$t \*\*\*"; koji list-tagged v$VER-$t; echo; done
-
 def print_header(out):
     print('''
 <!DOCTYPE html>
@@ -78,6 +74,11 @@ def print_table_line(out, build, link, issues, by):
             </tr>
 ''', file=out)
 
+# open koji session
+config = koji.read_config("koji")
+session = koji.ClientSession('https://kojihub.xcp-ng.org', config)
+session.ssl_login(config['cert'], None, config['serverca'])
+
 # load the issues from plane, so we can search for the plane card related to a build
 resp = requests.get('https://project.vates.tech/api/v1/workspaces/vates-global/projects/43438eec-1335-4fc2-8804-5a4c32f4932d/issues/',
                      headers={'x-api-key': os.environ['PLANE_TOKEN']})
@@ -88,17 +89,9 @@ def print_table_line(out, build, link, issues, by):
     tags = [f'v{v}-{p}' for v in ['8.2', '8.3'] for p in ['incoming', 'ci', 'testing', 'candidates', 'lab']]
     for tag in tags:
         print_table_header(out, tag)
-        koji_output = check_output(['koji', 'list-tagged', '--quiet', tag]).decode('utf8')
-        builds = [line.split() for line in koji_output.splitlines()]
-        with ThreadPool() as p:
-            build_info_outputs = p.map(lambda b: check_output(['koji', 'buildinfo', b[0]]).decode('utf8'), builds)
-        for build_info_output in build_info_outputs:
-            kv_lines = [line.split(': ') for line in build_info_output.splitlines()]
-            build_info = dict(kv for kv in kv_lines if len(kv) == 2)
-            id = re.search(r'\[(.+)\]', build_info['BUILD']).group(1)
-            build_url = f'https://koji.xcp-ng.org/buildinfo?buildID={id}'
+        for build in session.listTagged(tag):
+            build_url = f'https://koji.xcp-ng.org/buildinfo?buildID={build['build_id']}'
             build_issues = [i for i in project_issues['results'] if f'href="{build_url}"' in i['description_html']]
-            print_table_line(out, build_info['BUILD'].split()[0], build_url,
-                             build_issues, build_info['Built by'])
+            print_table_line(out, build['nvr'], build_url, build_issues, build['owner_name'])
         print_table_footer(out)
     print_footer(out)
