add the pull request matching the koji build

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

scripts/pkg_in_pipe/pkg_in_pipe.py

@@ -3,10 +3,13 @@
 import argparse
 import io
 import os
+import re
 import sys
 from datetime import datetime
 from textwrap import dedent
 
+import github
+import github.PullRequest
 import koji
 import requests
 
@@ -66,6 +69,9 @@ def print_table_header(out, tag):
                         <th scope="col" class="px-6 py-3">
                             Cards
                         </th>
+                        <th scope="col" class="px-6 py-3">
+                            Pull Requests
+                        </th>
                         <th scope="col" class="px-6 py-3">
                             By
                         </th>
@@ -82,7 +88,7 @@ def print_table_footer(out):
         </div>
         '''), file=out)
 
-def print_table_line(out, build, link, issues, by):
+def print_table_line(out, build, link, issues, by, prs: list[github.PullRequest.PullRequest]):
     issues_content = '\n'.join([
         f'''<li>
                 <a class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
@@ -91,6 +97,14 @@ def print_table_line(out, build, link, issues, by):
             </li>'''
         for i in issues
     ])
+    prs_content = '\n'.join([
+        f'''<li>
+                <a class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
+                   href="{pr.html_url}">{pr.title}
+                </a>
+            </li>'''
+        for pr in prs
+    ])
     print(f'''    
         <tr class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700 border-gray-200">
             <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
@@ -101,12 +115,22 @@ def print_table_line(out, build, link, issues, by):
                 {issues_content}
                 </ul>
             </td>
+            <td class="px-6 py-4">
+                <ul>
+                {prs_content}
+                </ul>
+            </td>
             <td class="px-6 py-4">
                 {by}
             </td>
         </tr>
         ''', file=out)  # nopep8
 
+def parse_source(source):
+    groups = re.match(r'git\+https://github\.com/([\w-]+/[\w-]+)(|\.git)#([0-9a-f]{40})', source)
+    assert groups is not None, "can't match the source to the expected github url"
+    return (groups[1], groups[3])
+
 parser = argparse.ArgumentParser(description='Generate a report of the packages in the pipe')
 parser.add_argument('output', nargs='?', help='Report output path', default='report.html')
 parser.add_argument('--generated-info', help="Add this message about the generation in the report")
@@ -120,6 +144,9 @@ def print_table_line(out, build, link, issues, by):
 )
 issues = resp.json().get('results', [])
 
+# connect to github
+gh = github.Github(auth=github.Auth.Token(os.environ['GITHUB_TOKEN']))
+
 ok = True
 with open(args.output, 'w') as out:
     print_header(out)
@@ -134,10 +161,15 @@ def print_table_line(out, build, link, issues, by):
         session.ssl_login(config['cert'], None, config['serverca'])
         for tag in tags:
             print_table_header(temp_out, tag)
-            for build in sorted(session.listTagged(tag), key=lambda build: int(build['build_id']), reverse=True):
-                build_url = f'https://koji.xcp-ng.org/buildinfo?buildID={build['build_id']}'
+            for tagged in sorted(session.listTagged(tag), key=lambda build: int(build['build_id']), reverse=True):
+                build = session.getBuild(tagged['build_id'])
+                prs: list[github.PullRequest.PullRequest] = []
+                if build['source'] is not None:
+                    (repo, sha) = parse_source(build['source'])
+                    prs = list(gh.get_repo(repo).get_commit(sha).get_pulls())
+                build_url = f'https://koji.xcp-ng.org/buildinfo?buildID={tagged['build_id']}'
                 build_issues = [i for i in issues if f'href="{build_url}"' in i['description_html']]
-                print_table_line(temp_out, build['nvr'], build_url, build_issues, build['owner_name'])
+                print_table_line(temp_out, tagged['nvr'], build_url, build_issues, tagged['owner_name'], prs)
             print_table_footer(temp_out)
         out.write(temp_out.getvalue())
     except Exception as e: