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

[Shih-Yuan Lee]

$ time oem-meta-packages --quiet --dry-run update --kernel linux-generic-hwe-20.04 oem-hw-info/platform-info/somerville/fossa-warcraft-amd.json
...
real 3m40.142s
user 1m22.641s
sys 0m6.140s

$ time oem-meta-packages --use-cache --quiet --dry-run update oem-hw-info/platform-info/somerville/fossa-warcraft-amd.json
...
real 0m18.595s
user 0m8.378s
sys 0m1.332s

$ time oem-meta-packages --use-cache --quiet --dry-run update oem-hw-info/platform-info/stella/jellyfish-aron.json
<WARNING> (oem-stella-aron-meta:aron-jammy-oem) $ git show
commit 447111a81813bae99026e81939f4a64f6a604329
Author: Shih-Yuan Lee (FourDollars) <email address hidden>
Date: Fri Jun 2 22:45:17 2023 +0800

    Update the market name for linux-oem-22.04b.

    Updated by oem-scripts 1.79.

diff --git a/debian/changelog b/debian/changelog
index 615b523..4767da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oem-stella-aron-meta (22.04ubuntu4) jammy; urgency=medium
+
+ * Update the market name for linux-oem-22.04b.
+
+ -- Shih-Yuan Lee (FourDollars) <email address hidden> Fri, 02 Jun 2023 22:45:17 +0800
+
 oem-stella-aron-meta (22.04ubuntu3) jammy; urgency=medium

   * Update hp-doc and eula to march23-wks version. (LP: #1996787).
diff --git a/debian/control b/debian/control
index 2e69a69..0ca16a0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,16 +12,16 @@ Architecture: all
 Depends: ${misc:Depends}, ubuntu-oem-keyring, linux-oem-22.04b, oem-stella-meta
 XB-Modaliases: ${modaliases}
 XB-Ubuntu-OEM-Kernel-Flavour: oem
-Description: hardware support for Stella Aron platform
- This is a metapackage for Stella Aron platform.
+Description: hardware support for HP Z2 Tower G9 Workstation Desktop PC
+ This is a metapackage for HP Z2 Tower G9 Workstation Desktop PC.
  It installs packages needed to support this hardware fully.

 Package: oem-stella-factory-aron-meta
 Architecture: all
 Depends: ${misc:Depends}, oem-stella-factory-meta, oem-doc-hp-march23-wks, oem-eula-march23-wks
 Recommends: stella-hp-wallpaper-rik
-Description: hardware support for Stella Aron platform (factory)
- This is a factory metapackage for Stella Aron platform.
+Description: hardware support for HP Z2 Tower G9 Workstation Desktop PC (factory)
+ This is a factory metapackage for HP Z2 Tower G9 Workstation Desktop PC.
  It installs packages needed to support this hardware fully. (factory)

 Package: oem-stella.cmit-aron-meta

real 0m29.240s
user 0m8.929s
sys 0m1.812s

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

[autopkgtest]
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 FAIL non-zero exit status 1
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.79-9c39999-in-linux-container-jammy

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

[autopkgtest]
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 FAIL non-zero exit status 1
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.79-0ca2829-in-linux-container-jammy

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

[autopkgtest]
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.79-0d1a0f2-in-linux-container-jammy

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

[autopkgtest]
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 FAIL non-zero exit status 1
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.79-6281c89-in-linux-container-jammy

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

[autopkgtest]
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.79-1b7fe31-in-linux-container-jammy

[Kai-Chuan Hsieh (kchsieh)]

LGTM

review: Approve

diff --git a/debian/tests/oem-meta-packages b/debian/tests/oem-meta-packages
index 318da7c..f42eeb3 100644
--- a/debian/tests/oem-meta-packages
+++ b/debian/tests/oem-meta-packages
@@ -9,6 +9,17 @@ RET=0
 oem-meta-packages --quiet list
 
 # collect
+if ! timeout 10s oem-meta-packages --quiet --series focal --use-cache collect oem-somerville-aipom-adl-meta; then
+    echo "FAIL: Timeout after 10s for 'oem-meta-packages --quiet --series focal --use-cache collect oem-somerville-aipom-adl-meta'."
+    RET=1
+fi
+if [ -f oem-somerville-aipom-adl-meta.json ] && [ "$(jq -r '."oem-somerville-aipom-adl-meta".new_desc' < oem-somerville-aipom-adl-meta.json)" = "Dell OptiPlex 5400 AIO, 7400 AIO" ]; then
+    jq '."oem-somerville-aipom-adl-meta"' < oem-somerville-aipom-adl-meta.json
+else
+    echo "FAIL: oem-somerville-aipom-adl-meta.json is expected to be generated after 'oem-meta-packages --quiet --series focal --use-cache collect oem-somerville-aipom-adl-meta'."
+    RET=1
+fi
+
 cat > fossa-bronn.json <<ENDLINE
 {
   "certification-hardware": [
@@ -35,9 +46,9 @@ cat > fossa-bronn.json <<ENDLINE
   "short_description": "Precision 12345"
 }
 ENDLINE
-oem-meta-packages --series focal --quiet collect fossa-bronn.json -o oem-somerville-bronn-meta.json
-if [ "$(jq -r '."oem-somerville-bronn-meta".new_desc' < oem-somerville-bronn-meta.json)" != "Dell Precision 12345" ]; then
-    echo "FAIL: 'oem-meta-packages --series focal --quiet collect fossa-bronn.json -o oem-somerville-bronn-meta.json' failed."
+oem-meta-packages --series focal --quiet collect fossa-bronn.json -o random.json
+if [ "$(jq -r '."oem-somerville-bronn-meta".new_desc' < random.json)" != "Dell Precision 12345" ]; then
+    echo "FAIL: 'oem-meta-packages --series focal --quiet collect fossa-bronn.json -o random.json' failed."
     RET=1
 fi
 
@@ -176,17 +187,17 @@ oem-meta-packages create jellyfish-cais.json
 mv oem-sutton-cais-meta jellyfish-cais-meta-2
 
 # update
-oem-meta-packages --dry-run --series focal update oem-somerville-tentacool-meta --kernel linux-generic-hwe-20.04
-oem-meta-packages --dry-run --series focal update oem-stella.cmit-camerupt-meta --kernel linux-generic-hwe-20.04
-oem-meta-packages --dry-run --series jammy update oem-somerville-tentacool-meta --kernel linux-generic-hwe-22.04
-oem-meta-packages --dry-run --series jammy update oem-stella-aron-meta --kernel linux-generic-hwe-22.04
+oem-meta-packages --dry-run --use-cache --series focal update oem-somerville-tentacool-meta --kernel linux-generic-hwe-20.04
+oem-meta-packages --dry-run --use-cache --series focal update oem-stella.cmit-camerupt-meta --kernel linux-generic-hwe-20.04
+oem-meta-packages --dry-run --use-cache --series jammy update oem-somerville-tentacool-meta --kernel linux-generic-hwe-22.04
+oem-meta-packages --dry-run --use-cache --series jammy update oem-stella-aron-meta --kernel linux-generic-hwe-22.04
 
 # staging-copy
-oem-meta-packages --dry-run --series focal staging-copy oem-somerville-kingdra-adl-meta 2>&1 | grep -e cesg:somerville-fossa-kingdra-adl-focal-staging -e somerville-fossa-kingdra-adl-focal-devel
-oem-meta-packages --dry-run --series focal staging-copy oem-somerville-charmander-meta 2>&1 | grep -e cesg:somerville-fossa-charmander-focal-staging -e cesg:somerville-fossa-charmander-focal-devel
-oem-meta-packages --dry-run --series focal staging-copy oem-stella.cmit-aerodactyl-meta 2>&1 | grep -e cesg:stella-cmit-ouagadougou-focal-staging -e stella-cmit-ouagadougou-focal-devel
-oem-meta-packages --dry-run --series focal staging-copy oem-sutton.newell-aaden-meta 2>&1 | grep -e cesg:sutton-newell-focal-staging -e cesg:sutton-newell-focal-devel
-oem-meta-packages --dry-run --series jammy staging-copy oem-somerville-tentacool-meta 2>&1 | grep -e cesg:somerville-jellyfish-tentacool-jammy-devel -e cesg:somerville-jellyfish-tentacool-jammy-staging
-oem-meta-packages --dry-run --series jammy staging-copy oem-sutton-balesego-meta 2>&1 | grep -e cesg:sutton-jammy-devel -e cesg:sutton-jammy-staging
+oem-meta-packages --dry-run --use-cache --series focal staging-copy oem-somerville-kingdra-adl-meta 2>&1 | grep -e cesg:somerville-fossa-kingdra-adl-focal-staging -e somerville-fossa-kingdra-adl-focal-devel
+oem-meta-packages --dry-run --use-cache --series focal staging-copy oem-somerville-charmander-meta 2>&1 | grep -e cesg:somerville-fossa-charmander-focal-staging -e cesg:somerville-fossa-charmander-focal-devel
+oem-meta-packages --dry-run --use-cache --series focal staging-copy oem-stella.cmit-aerodactyl-meta 2>&1 | grep -e cesg:stella-cmit-ouagadougou-focal-staging -e stella-cmit-ouagadougou-focal-devel
+oem-meta-packages --dry-run --use-cache --series focal staging-copy oem-sutton.newell-aaden-meta 2>&1 | grep -e cesg:sutton-newell-focal-staging -e cesg:sutton-newell-focal-devel
+oem-meta-packages --dry-run --use-cache --series jammy staging-copy oem-somerville-tentacool-meta 2>&1 | grep -e cesg:somerville-jellyfish-tentacool-jammy-devel -e cesg:somerville-jellyfish-tentacool-jammy-staging
+oem-meta-packages --dry-run --use-cache --series jammy staging-copy oem-sutton-balesego-meta 2>&1 | grep -e cesg:sutton-jammy-devel -e cesg:sutton-jammy-staging
 
 exit "$RET"
diff --git a/oem-meta-packages b/oem-meta-packages
index 4fe104e..1e826b3 100755
--- a/oem-meta-packages
+++ b/oem-meta-packages
@@ -150,6 +150,11 @@ parser.add_argument("--yes", help="Say yes for all prompts.", action="store_true
 parser.add_argument("--apt-dir", type=str, help="specify the dir for apt")
 series = lsb_release.get_os_release()["CODENAME"]
 parser.add_argument(
+    "--use-cache",
+    help=f"Use cache from https://people.canonical.com/~oem-enablement/oem-meta-packages/oem-{{somerville,stella,sutton}}-*-meta-{series}.json to speed up the process. (experimental)",
+    action="store_true",
+)
+parser.add_argument(
     "--series",
     help=f"Specify the series codename, such as focal or jammy. ('{series}' by default)",
 )
@@ -257,7 +262,7 @@ create.add_argument(
 
 update = subparsers.add_parser(
     "update",
-    help="[-h] oem-qemu-meta",
+    help="[-h] oem-qemu-meta --kernel KERNEL",
     formatter_class=argparse.RawDescriptionHelpFormatter,
     epilog="""
 For example,
@@ -273,7 +278,6 @@ update.add_argument(
 update.add_argument(
     "--kernel",
     choices=ALLOWED_KERNEL_META_LIST,
-    default="linux-generic-hwe-20.04",
     help="Specify the kernel meta to update.",
 )
 update.add_argument(
@@ -1634,6 +1638,8 @@ def collect_pkg_info(
             print(f"{data} is not supported.")
             exit(1)
 
+        meta_name = data
+
         if "." in result.group(1):
             project, group = result.group(1).split(".")
         else:
@@ -1672,6 +1678,10 @@ def collect_pkg_info(
         project = data.get("project")
         codename = data.get("platform")
         group = data.get("group")
+        if data.get("series") == "focal" and project != "somerville":
+            meta_name = f"oem-{project}.{group}-{codename}-meta"
+        else:
+            meta_name = f"oem-{project}-{codename}-meta"
         if project == "somerville":
             customer = "Dell"
             tag = animal + "-" + data.get("platform")
@@ -1699,6 +1709,58 @@ def collect_pkg_info(
         if "productnames" in data:
             json_data["ProductNames"] = data["productnames"]
 
+    if args.use_cache:
+        json_url = f"https://people.canonical.com/~oem-enablement/oem-meta-packages/{meta_name}-{series}.json"
+        req = requests.get(json_url)
+        if req.status_code != 200:
+            error("Fetching {json_url} failed.")
+            exit(1)
+        payload = json.loads(req.text)
+        pkgInfo = dict()
+        pkgInfo[meta_name] = PkgInfo(
+            bootstrap=payload[meta_name]["bootstrap"],
+            oem=payload[meta_name]["oem"],
+            old_desc=payload[meta_name]["old_desc"],
+            new_desc=payload[meta_name]["new_desc"],
+            product_names=payload[meta_name]["product_names"],
+        )
+
+        if type(data) is not str and data.get("short_description"):
+            market_name = data.get("short_description")
+        elif payload[meta_name]["bootstrap"]["git"]["market_name"]:
+            market_name = payload[meta_name]["bootstrap"]["git"]["market_name"]
+        elif payload[meta_name]["oem"]["git"]["market_name"]:
+            market_name = payload[meta_name]["oem"]["git"]["market_name"]
+        else:
+            market_name = ""
+
+        if project == "somerville":
+            branding = "Dell"
+        elif project == "stella":
+            branding = "HP"
+        elif project == "sutton":
+            branding = "Lenovo"
+        else:
+            error("f{project} is not supported yet.")
+            exit(1)
+
+        if not pkgInfo[meta_name].new_desc and market_name:
+            if branding in market_name:
+                pkgInfo[meta_name].new_desc = market_name
+            else:
+                pkgInfo[meta_name].new_desc = f"{branding} {market_name}"
+            if group:
+                pkgInfo[
+                    meta_name
+                ].old_desc = (
+                    f"{project.title()} {group.title()} {codename.title()} platform"
+                )
+            else:
+                pkgInfo[
+                    meta_name
+                ].old_desc = f"{project.title()} {codename.title()} platform"
+        return pkgInfo
+
     debug(json.dumps(json_data, indent=4, sort_keys=True))
 
     somerville = dict()
@@ -1893,6 +1955,9 @@ def process_update_task(pkgInfo) -> None:
 def deal_with_meta_git(pkg_name: str, pkg_info: PkgInfo, bootstrap: bool) -> bool:
     result = meta_pattern.match(pkg_name)
 
+    if not args.kernel:
+        args.kernel = pkg_info.oem.git.kernel_meta
+
     if not result:
         return
 
@@ -2206,9 +2271,13 @@ elif args.subcommand == "update":
     oem_scripts_config = ConfigParser()
     oem_scripts_config.read(oem_scripts_config_ini)
     config = oem_scripts_config["private"]
-    r = requests.get(
-        config["archive"] + "/dists/", auth=(config["username"], config["password"])
-    )
+    if args.use_cache:
+        text = None
+    else:
+        r = requests.get(
+            config["archive"] + "/dists/", auth=(config["username"], config["password"])
+        )
+        text = r.text
     if os.path.exists(args.meta):
         with open(args.meta) as data:
             meta_json = json.load(data)
@@ -2220,11 +2289,11 @@ elif args.subcommand == "update":
             series = meta_json["series"]
             animal = get_animal(series)
         pkgInfo = collect_pkg_info(
-            meta_json, check_private=True, index=r.text, config=config
+            meta_json, check_private=True, index=text, config=config
         )
     else:
         pkgInfo = collect_pkg_info(
-            args.meta, check_private=True, index=r.text, config=config
+            args.meta, check_private=True, index=text, config=config
         )
     process_update_task(pkgInfo)
 elif args.subcommand == "collect":