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

[Shih-Yuan Lee]

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

[autopkgtest]
pkg-iot-meta PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
lp-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.83-fe9395e-in-linux-container-jammy

[Bin Li (binli)]

LGTM.

review: Approve

diff --git a/bootstrap-meta b/bootstrap-meta
index c523795..77a15c3 100755
--- a/bootstrap-meta
+++ b/bootstrap-meta
@@ -31,7 +31,6 @@ from copy import copy
 from logging import info, warning, error, critical
 from oem_scripts import (
     ALLOWED_KERNEL_META_LIST,
-    SUBSCRIBER_LIST,
     TAG_LIST,
     _get_items_from_git,
     _run_command,
@@ -295,8 +294,8 @@ class BootstrapMetaSRU(BootstrapMeta):
 
         subscriptions = list(map(lambda x: x.person.name, bug.subscriptions))
         tags = copy(bug.tags)
-        if ready or release:
-            for subscriber in SUBSCRIBER_LIST:
+        if ready and release:
+            for subscriber in ("oem-solutions-engineers", "ubuntu-sponsors"):
                 if subscriber not in subscriptions:
                     bug.subscribe(person=lp.people[subscriber])
         if "oem-solutions-engineers" not in subscriptions:
diff --git a/debian/tests/mir-bug b/debian/tests/mir-bug
index 94610c8..9f880d8 100644
--- a/debian/tests/mir-bug
+++ b/debian/tests/mir-bug
@@ -67,7 +67,7 @@ mir-bug update --yes --skip "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
 payload=$(lp-api get bugs/"$BUG_ID")
 for link in $(lp-api .subscriptions_collection_link <<< "$payload" | jq -r '.entries|.[]|.self_link'); do
     case "$(basename "$link")" in
-        (ubuntu-sponsors|ubuntu-desktop)
+        (ubuntu-sponsors|ubuntu-desktop|ubuntu-archive)
             echo "FAIL: '$link' shall not be subscribed by 'mir-bug update --yes --skip'."
             ERR=1
             ;;
@@ -77,7 +77,7 @@ mir-bug update --yes --skip --ready "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool
 payload=$(lp-api get bugs/"$BUG_ID")
 for link in $(lp-api .subscriptions_collection_link <<< "$payload" | jq -r '.entries|.[]|.self_link'); do
     case "$(basename "$link")" in
-        (ubuntu-sponsors|ubuntu-desktop)
+        (ubuntu-sponsors|ubuntu-desktop|ubuntu-archive)
             echo "FAIL: '$link' shall not be subscribed by 'mir-bug update --yes --skip --ready'."
             ERR=1
             ;;
diff --git a/mir-bug b/mir-bug
index 6049d74..6f85169 100755
--- a/mir-bug
+++ b/mir-bug
@@ -37,7 +37,6 @@ from distro_info import UbuntuDistroInfo
 from glob import glob
 from logging import debug, info, warning, error, critical
 from oem_scripts import (
-    SUBSCRIBER_LIST,
     TAG_LIST,
     _get_items_from_git,
     _run_command,
@@ -115,7 +114,7 @@ update.add_argument(
 update.add_argument(
     "--release",
     action="store_true",
-    help="Also affects 'Ubuntu', and subscribe 'ubuntu-sponsors'.",
+    help="Also affects 'Ubuntu', and subscribe 'ubuntu-archive'.",
 )
 
 check = subparsers.add_parser(
@@ -141,10 +140,12 @@ check.add_argument(
 check.add_argument(
     "--ready",
     action="store_true",
-    help="Check if the bug is Fix Committed, also affects 'Ubuntu', and subscribe 'ubuntu-sponsors' and 'ubuntu-desktop'.",
+    help="Check if the oem-priority bug is Fix Committed, and doesn't also affect 'Ubuntu', and doesn't subscribe 'ubuntu-archive', 'ubuntu-sponsors' and 'ubuntu-desktop'.",
 )
 check.add_argument(
-    "--release", action="store_true", help="Check if the bug is ready to release."
+    "--release",
+    action="store_true",
+    help="Check if the bug is ready to release and subscribed 'ubuntu-archive'.",
 )
 
 collect = subparsers.add_parser("collect", help="[-h] [--ubuntu-certified] jsonFile")
@@ -411,7 +412,7 @@ def update_bug(
                     task.importance = "Critical"
                     task.lp_save()
 
-    update_bug_status(bug, pkg_name, yes, series)
+    check_and_update_bug_status(bug, pkg_name, series, yes=yes, update=True)
 
     check_and_update_bug_subscriptions(lp, bug, update=True, yes=yes)
 
@@ -475,7 +476,7 @@ def check_bug(
         need_fixing = True
     if check_bug_importance(bug) is False:
         need_fixing = True
-    if check_bug_status(bug, pkg_name, series) is False:
+    if check_and_update_bug_status(bug, pkg_name, series, update=False) is False:
         need_fixing = True
     if check_and_update_bug_subscriptions(lp, bug) is False:
         need_fixing = True
@@ -598,97 +599,61 @@ def check_bug_importance(bug) -> bool:
     return result
 
 
-def _expected_status(target_name: str, status: str, expected: str) -> bool:
-    if status != expected:
+def _expected_task_status(bug_task, expected_status: str) -> bool:
+    if bug_task.status != expected_status:
         error(
-            f"The '{target_name}' status is expected to be '{expected}' instead of '{status}'."
+            f"The '{bug_task.bug_target_name}' status is expected to be '{expected_status}' instead of '{bug_task.status}'."
         )
         return False
     return True
 
 
-def check_bug_status(bug, pkg_name: str, series: str) -> bool:
-    info("Checking bug status...")
-    result = True
-    saw_ubuntu_task = False
-    for task in bug.bug_tasks:
-        if task.bug_target_name == "oem-priority":
-            if args.ready:
-                if (
-                    _expected_status(task.bug_target_name, task.status, "Fix Committed")
-                    is False
-                ):
-                    result = False
-            else:
-                if (
-                    _expected_status(task.bug_target_name, task.status, "In Progress")
-                    is False
-                ):
-                    result = False
-        elif (
-            task.bug_target_name == "ubuntu"
-            or f"{pkg_name} (Ubuntu)" in task.bug_target_name
-            or f"{pkg_name} (Ubuntu {series.capitalize()})" in task.bug_target_name
-        ):
-            saw_ubuntu_task = True
-            if args.release:
-                if (
-                    _expected_status(task.bug_target_name, task.status, "In Progress")
-                    is False
-                ):
-                    result = False
-            elif args.ready:
-                if (
-                    _expected_status(task.bug_target_name, task.status, "Confirmed")
-                    is False
-                ):
-                    result = False
-            else:
-                if (
-                    _expected_status(task.bug_target_name, task.status, "Incomplete")
-                    is False
-                ):
-                    result = False
-        else:
-            critical(f"It is unexpected to have '{task.bug_target_name}' task")
-    if args.ready and saw_ubuntu_task is False:
-        result = False
-        error("There is no 'ubuntu' status.")
-    return result
-
-
-def _ok_to_change_status(
-    target_name: str, orig_status: str, new_status: str, yes: bool
-) -> bool:
-    if orig_status == new_status:
+def _ok_to_change_task_status(bug_task, new_status: str, yes: bool) -> bool:
+    if bug_task.status == new_status:
         return False
     if yes_or_ask(
         yes,
-        f"Would you like to change the '{target_name}' status from '{orig_status}' to '{new_status}'?",
+        f"Would you like to change the '{bug_task.bug_target_name}' status from '{bug_task.status}' to '{new_status}'?",
     ):
         return True
     return False
 
 
-def _change_task_status(task, new_status: str, yes: bool) -> bool:
-    if _expected_status(
-        task.bug_target_name, task.status, new_status
-    ) is False and _ok_to_change_status(
-        task.bug_target_name, task.status, new_status, yes
-    ):
-        task.status = new_status
-        task.lp_save()
+def _check_and_change_task_status(
+    task, new_status: str, yes=False, update=False
+) -> bool:
+    if update:
+        if not _expected_task_status(task, new_status) and _ok_to_change_task_status(
+            task, new_status, yes
+        ):
+            task.status = new_status
+            task.lp_save()
+        return True
+    else:
+        return _expected_task_status(task, new_status)
 
 
-def update_bug_status(bug, pkg_name: str, yes: bool, series: str) -> None:
-    info("Updating bug status...")
+def check_and_update_bug_status(
+    bug, pkg_name: str, series: str, yes=False, update=False
+) -> None:
+    if update:
+        info("Updating bug status...")
+    else:
+        info("Checking bug status...")
+    result = True
     saw_ubuntu_task = False
     for bug_task in bug.bug_tasks:
         if bug_task.bug_target_name == "oem-priority":
             if args.ready:
-                _change_task_status(bug_task, "Fix Committed", yes)
+                if not _check_and_change_task_status(
+                    bug_task, "Fix Committed", yes=yes, update=update
+                ):
+                    result = False
             else:
-                _change_task_status(bug_task, "In Progress", yes)
+                if not _check_and_change_task_status(
+                    bug_task, "In Progress", yes=yes, update=update
+                ):
+                    result = False
         elif (
             bug_task.bug_target_name == "ubuntu"
             or f"{pkg_name} (Ubuntu)" in bug_task.bug_target_name
@@ -696,10 +661,16 @@ def update_bug_status(bug, pkg_name: str, yes: bool, series: str) -> None:
         ):
             saw_ubuntu_task = True
             if args.release:
-                _change_task_status(bug_task, "In Progress", yes)
+                if not _check_and_change_task_status(
+                    bug_task, "In Progress", yes=yes, update=update
+                ):
+                    result = False
             elif args.ready:
-                _change_task_status(bug_task, "Confirmed", yes)
-            elif yes_or_ask(
+                if not _check_and_change_task_status(
+                    bug_task, "Confirmed", yes=yes, update=update
+                ):
+                    result = False
+            elif update and yes_or_ask(
                 yes,
                 f"Would you like to delete the '{bug_task.bug_target_name}' bug_task? (Don't affect '{bug_task.bug_target_display_name}')",
             ):
@@ -710,22 +681,36 @@ def update_bug_status(bug, pkg_name: str, yes: bool, series: str) -> None:
                         f"{bug_task.bug_target_name} can not be deleted, so changing the status to Incomplete instead."
                     )
                     debug(e)
-                    _change_task_status(bug_task, "Incomplete", yes)
+                    _check_and_change_task_status(
+                        bug_task, "Incomplete", yes=yes, update=update
+                    )
                 except lazr.restfulclient.errors.Unauthorized as e:
                     warning(
                         f"{bug_task.bug_target_name} can not be deleted, so changing the status to Incomplete instead."
                     )
                     debug(e)
-                    _change_task_status(bug_task, "Incomplete", yes)
+                    _check_and_change_task_status(
+                        bug_task, "Incomplete", yes=yes, update=update
+                    )
             else:
-                _change_task_status(bug_task, "Incomplete", yes)
+                if not _check_and_change_task_status(
+                    bug_task, "Incomplete", yes=yes, update=update
+                ):
+                    result = False
         else:
-            warning(f"{bug_task.bug_target_name} {bug_task.status}")
-    if args.release and args.ready and saw_ubuntu_task is False:
+            warning(
+                f"It is unexpected to see the '{bug_task.bug_target_name}' task and the '{bug_task.status}' status."
+            )
+    if update and args.release and args.ready and saw_ubuntu_task is False:
         bug.addTask(target=lp.projects["Ubuntu"])
         for bug_task in bug.bug_tasks:
             if bug_task.bug_target_name == "ubuntu":
-                _change_task_status(bug_task, "In Progress", yes)
+                _check_and_change_task_status(
+                    bug_task, "In Progress", yes=True, update=True
+                )
+    if not update and not args.release and not args.ready and saw_ubuntu_task:
+        result = False
+    return result
 
 
 def check_and_update_bug_subscriptions(lp, bug, update=False, yes=False) -> bool:
@@ -738,7 +723,7 @@ def check_and_update_bug_subscriptions(lp, bug, update=False, yes=False) -> bool
     for subscription in bug.subscriptions:
         subscriptions.append(subscription.person.name)
         if not args.ready or not args.release:
-            for subscriber in ("ubuntu-sponsors", "ubuntu-desktop"):
+            for subscriber in ("ubuntu-archive", "ubuntu-sponsors", "ubuntu-desktop"):
                 if subscriber == subscription.person.name:
                     if subscription.canBeUnsubscribedByUser():
                         error(f"'{subscriber}' should not be in the subscriptions.")
@@ -753,7 +738,7 @@ def check_and_update_bug_subscriptions(lp, bug, update=False, yes=False) -> bool
                             f"'{subscriber}' should not be in the subscriptions, and {lp.me.name} doesn't have the permission to unsubscribe it."
                         )
     if args.ready and args.release:
-        for subscriber in SUBSCRIBER_LIST:
+        for subscriber in ("oem-solutions-engineers", "ubuntu-archive"):
             if subscriber not in subscriptions:
                 error(f"'{subscriber}' is not in the subscriptions.")
                 if update and yes_or_ask(
diff --git a/oem_scripts/__init__.py b/oem_scripts/__init__.py
index a3aaceb..c8a6ffe 100644
--- a/oem_scripts/__init__.py
+++ b/oem_scripts/__init__.py
@@ -41,8 +41,6 @@ ALLOWED_KERNEL_META_LIST = (
     "linux-generic",
 )
 
-SUBSCRIBER_LIST = ("oem-solutions-engineers", "ubuntu-sponsors", "ubuntu-desktop")
-
 TAG_LIST = ["oem-meta-packages", "oem-priority", f"oem-scripts-{__version__}"]