Merge ~fourdollars/pc-enablement/+git/oem-scripts:master into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Shih-Yuan Lee]

https://warthogs.atlassian.net/browse/PCSWE-857

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages PASS
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.62-887127c-in-linux-container-jammy

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages PASS
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.62-d0092a9-in-linux-container-jammy

[Cyrus Lien (cyruslien)]

LGTM.

review: Approve

diff --git a/debian/tests/lp-bug b/debian/tests/lp-bug
index 42ea2b6..bfde720 100644
--- a/debian/tests/lp-bug
+++ b/debian/tests/lp-bug
@@ -6,9 +6,9 @@ IFS=$'\n\t'
 export LAUNCHPAD_API="https://api.staging.launchpad.net/"
 
 # Search for the latest bug to test.
-launchpad-api get cloudberry ws.op==searchTasks status=="Fix Committed" | jq -r '.entries | .[] | .bug_link' | sort -r | while read -r bug; do
+while read -r bug; do
     if launchpad-api get "$bug" | jq -r '.tags | .[]' | grep cqa-verified-staging >/dev/null; then
         lp-bug cqa-verify --dry-run "$(launchpad-api get "$bug" | jq -r '.id')"
         break
     fi
-done
+done < <(launchpad-api get cloudberry ws.op==searchTasks status=="Fix Committed" | jq -r '.entries | .[] | .bug_link' | sort -r)
diff --git a/lp-bug b/lp-bug
index 17db05e..d4ccb74 100755
--- a/lp-bug
+++ b/lp-bug
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020  Canonical Ltd.
+# Copyright (C) 2020-2023  Canonical Ltd.
 # Author: Shih-Yuan Lee (FourDollars) <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,12 +22,12 @@ import lazr
 import logging
 import oem_scripts
 import re
-import subprocess
 import sys
 import os
 
 from apt import apt_pkg
-from logging import debug, warning, info, critical
+from logging import debug, warning, info, error
+from oem_scripts import _run_command
 from oem_scripts.LaunchpadLogin import LaunchpadLogin
 from tempfile import TemporaryDirectory
 
@@ -225,42 +225,11 @@ def cleanup_bug(lp, bug_number: int, yes: bool) -> None:
     info(f"LP: #{bug.id} has been cleaned. {bug.web_link}")
 
 
-def _run_command(
-    command: list or tuple, returncode=(0,), env=None, silent=False
-) -> (str, str, int):
-    if not silent:
-        debug("$ " + " ".join(command))
-    proc = subprocess.Popen(
-        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env
-    )
-    out, err = proc.communicate()
-
-    if out:
-        out = out.decode("utf-8").strip()
-    if err:
-        err = err.decode("utf-8").strip()
-
-    if proc.returncode not in returncode:
-        critical(f"return {proc.returncode}")
-        if out:
-            info(out)
-        if err:
-            critical(err)
-        exit(1)
-
-    if not silent:
-        if out:
-            debug(out)
-        if err:
-            debug(err)
-
-    return (out, err, proc.returncode)
-
-
 pattern = re.compile(r"(.*) \(==(.*)\)")
 
 
-def cloudberry_cqa_verified(lp, yes: bool, bugID: int) -> None:
+def cloudberry_cqa_verified(lp, yes: bool, bugID: int) -> bool:
+    no_error = True
     cloudberry = lp.projects["cloudberry"]
     # Only deal with those bugs with 'Fix Committed' and 'request of publish_package' in the title.
     tasks = cloudberry.searchTasks(
@@ -316,14 +285,15 @@ def cloudberry_cqa_verified(lp, yes: bool, bugID: int) -> None:
         with TemporaryDirectory() as tmpdir:
             failed = False
             fingerprint = "F9FDA6BED73CDC22"
-            series = ["focal", "bionic", "xenial"]
+            series = ["jammy", "focal", "bionic", "xenial"]
             codename = ""
             for item in series:
                 if item in prod_archive_line:
                     codename = item
                     break
             if not codename:
-                warning(f"'{prod_archive_line}' is not supported.")
+                error(f"'{prod_archive_line}' is not supported.")
+                no_error = False
                 continue
             # Setup the temporary apt dir to include the production archive.
             output, _, returncode = _run_command(
@@ -350,15 +320,20 @@ def cloudberry_cqa_verified(lp, yes: bool, bugID: int) -> None:
                 continue
             # Use the temporary apt dir to compare the package versions.
             for pkg, ver in packages:
-                output, _, _ = _run_command(["pkg-list", "--apt-dir", tmpdir, pkg])
-                for line in output.split("\n"):
-                    archive_pkg, archive_ver = line.split(" ")
-                    if pkg == archive_pkg:
-                        if apt_pkg.version_compare(archive_ver, ver) >= 0:
-                            print(f"{line} >= {ver}")
-                        else:
-                            warning(f"{line} < {ver}")
-                            failed = True
+                output, _, returncode = _run_command(
+                    ["pkg-list", "--apt-dir", tmpdir, pkg], returncode=(0, 1)
+                )
+                if returncode == 1:
+                    failed = True
+                else:
+                    for line in output.split("\n"):
+                        archive_pkg, archive_ver = line.split(" ")
+                        if pkg == archive_pkg:
+                            if apt_pkg.version_compare(archive_ver, ver) >= 0:
+                                print(f"{line} >= {ver}")
+                            else:
+                                warning(f"{line} < {ver}")
+                                failed = True
             # Tag "cqa-verified" if no failure.
             if not failed:
                 if not args.dry_run and _yes_or_ask(
@@ -371,6 +346,7 @@ def cloudberry_cqa_verified(lp, yes: bool, bugID: int) -> None:
                         tags.append(f"oem-scripts-{oem_scripts.__version__}")
                     bug.tags = tags
                     bug.lp_save()
+    return no_error
 
 
 def attach_file_to_bug(
@@ -401,7 +377,10 @@ if args.subcommand == "copy":
 elif args.subcommand == "cleanup":
     cleanup_bug(lp, args.bugID, args.yes)
 elif args.subcommand == "cqa-verify":
-    cloudberry_cqa_verified(lp, args.yes, args.bugID)
+    if cloudberry_cqa_verified(lp, args.yes, args.bugID):
+        exit(0)
+    else:
+        exit(1)
 elif args.subcommand == "attach":
     attach_file_to_bug(
         lp, args.filepath, args.bugID, name=args.name, comment=args.comment