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

[Shih-Yuan Lee]

The major idea for this merge proposal is that I provided a fake product name "Precision 12345" and it can be found in the collected result.

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

[autopkgtest]
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind FAIL non-zero exit status 1
get-private-ppa FAIL non-zero exit status 1
lp-api FAIL non-zero exit status 1
lp-bug FAIL stderr:
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta FAIL non-zero exit status 1
mir-bug FAIL non-zero exit status 1
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.78-0641365-in-linux-container-jammy

[Shih-Yuan Lee (fourdollars)]

The following tests are using Launchpad staging API and Launchpad staging API was broken.

bug-bind FAIL non-zero exit status 1
get-private-ppa FAIL non-zero exit status 1
lp-api FAIL non-zero exit status 1
lp-bug FAIL stderr:
bootstrap-meta FAIL non-zero exit status 1
mir-bug FAIL non-zero exit status 1

[Kai-Chuan Hsieh (kchsieh)]

LGTM

review: Approve

[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.78-0641365-in-linux-container-jammy

diff --git a/debian/tests/oem-meta-packages b/debian/tests/oem-meta-packages
index e40952c..318da7c 100644
--- a/debian/tests/oem-meta-packages
+++ b/debian/tests/oem-meta-packages
@@ -9,6 +9,38 @@ RET=0
 oem-meta-packages --quiet list
 
 # collect
+cat > fossa-bronn.json <<ENDLINE
+{
+  "certification-hardware": [
+    "202002-27725",
+    "202002-27726"
+  ],
+  "certified": true,
+  "certify-planning": [
+    1902074
+  ],
+  "group": "",
+  "hardware": [
+    "202002-27725",
+    "202002-27726"
+  ],
+  "metabug": 1897549,
+  "mirbug": 1897551,
+  "platform": "bronn",
+  "productnames": [
+    "Precision 5750"
+  ],
+  "project": "somerville",
+  "series": "focal",
+  "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."
+    RET=1
+fi
+
 oem-meta-packages --series focal --quiet collect oem-somerville-tentacool-meta
 if [ "$(jq -r '."oem-somerville-tentacool-meta".oem.git.kernel_meta' < oem-somerville-tentacool-meta.json)" != "linux-generic-hwe-20.04" ]; then
     echo "FAIL: 'oem-meta-packages --series focal --quiet collect oem-somerville-tentacool-meta' failed."
diff --git a/oem-meta-packages b/oem-meta-packages
index 49b427b..4fe104e 100755
--- a/oem-meta-packages
+++ b/oem-meta-packages
@@ -1764,7 +1764,9 @@ def collect_pkg_info(
             pkgInfo[pkg_name].old_desc = f"Somerville {codename.title()} platform"
             pkgInfo[pkg_name].new_desc = new_desc
 
-        if meta.bootstrap.git.market_name:
+        if type(data) is not str and data.get("short_description"):
+            market_name = data.get("short_description")
+        elif meta.bootstrap.git.market_name:
             market_name = meta.bootstrap.git.market_name
         elif meta.oem.git.market_name:
             market_name = meta.oem.git.market_name
@@ -1808,7 +1810,9 @@ def collect_pkg_info(
                 pkgInfo[pkg_name].old_desc = f"Stella {codename.title()} platform"
             pkgInfo[pkg_name].new_desc = new_desc
 
-        if meta.bootstrap.git.market_name:
+        if type(data) is not str and data.get("short_description"):
+            market_name = data.get("short_description")
+        elif meta.bootstrap.git.market_name:
             market_name = meta.bootstrap.git.market_name
         elif meta.oem.git.market_name:
             market_name = meta.oem.git.market_name
@@ -1857,7 +1861,9 @@ def collect_pkg_info(
                 pkgInfo[pkg_name].old_desc = f"Sutton {codename.title()} platform"
             pkgInfo[pkg_name].new_desc = new_desc
 
-        if meta.bootstrap.git.market_name:
+        if type(data) is not str and data.get("short_description"):
+            market_name = data.get("short_description")
+        elif meta.bootstrap.git.market_name:
             market_name = meta.bootstrap.git.market_name
         elif meta.oem.git.market_name:
             market_name = meta.oem.git.market_name