PC enablement tools

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

  1. Git
  2. lp:~fourdollars/pc-enablement/+git/oem-scripts
  3. master
  4. Merge into master
Proposed by Shih-Yuan Lee
Status: Merged
Approved by: Shih-Yuan Lee
Approved revision: 06413657c4d5bb81825e6b5a66f65f6a855e0402
Merged at revision: a549ca2b1702360e6102b65629adda1752a9d7a5
Proposed branch: ~fourdollars/pc-enablement/+git/oem-scripts:master
Merge into: ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master
Diff against target: 80 lines (+41/-3)
2 files modified
debian/tests/oem-meta-packages (+32/-0)
oem-meta-packages (+9/-3)
Reviewer Review Type Date Requested Status
Kai-Chuan Hsieh Approve
Review via email: mp+443775@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
OEM Taipei Bot (oem-taipei-bot) wrote :

[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

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

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

Revision history for this message
Kai-Chuan Hsieh (kchsieh) wrote :

LGTM

review: Approve
Revision history for this message
OEM Taipei Bot (oem-taipei-bot) wrote :

[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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
9oem-meta-packages --quiet list9oem-meta-packages --quiet list
1010
11# collect11# collect
12cat > fossa-bronn.json <<ENDLINE
13{
14 "certification-hardware": [
15 "202002-27725",
16 "202002-27726"
17 ],
18 "certified": true,
19 "certify-planning": [
20 1902074
21 ],
22 "group": "",
23 "hardware": [
24 "202002-27725",
25 "202002-27726"
26 ],
27 "metabug": 1897549,
28 "mirbug": 1897551,
29 "platform": "bronn",
30 "productnames": [
31 "Precision 5750"
32 ],
33 "project": "somerville",
34 "series": "focal",
35 "short_description": "Precision 12345"
36}
37ENDLINE
38oem-meta-packages --series focal --quiet collect fossa-bronn.json -o oem-somerville-bronn-meta.json
39if [ "$(jq -r '."oem-somerville-bronn-meta".new_desc' < oem-somerville-bronn-meta.json)" != "Dell Precision 12345" ]; then
40 echo "FAIL: 'oem-meta-packages --series focal --quiet collect fossa-bronn.json -o oem-somerville-bronn-meta.json' failed."
41 RET=1
42fi
43
12oem-meta-packages --series focal --quiet collect oem-somerville-tentacool-meta44oem-meta-packages --series focal --quiet collect oem-somerville-tentacool-meta
13if [ "$(jq -r '."oem-somerville-tentacool-meta".oem.git.kernel_meta' < oem-somerville-tentacool-meta.json)" != "linux-generic-hwe-20.04" ]; then45if [ "$(jq -r '."oem-somerville-tentacool-meta".oem.git.kernel_meta' < oem-somerville-tentacool-meta.json)" != "linux-generic-hwe-20.04" ]; then
14 echo "FAIL: 'oem-meta-packages --series focal --quiet collect oem-somerville-tentacool-meta' failed."46 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(
1764 pkgInfo[pkg_name].old_desc = f"Somerville {codename.title()} platform"1764 pkgInfo[pkg_name].old_desc = f"Somerville {codename.title()} platform"
1765 pkgInfo[pkg_name].new_desc = new_desc1765 pkgInfo[pkg_name].new_desc = new_desc
17661766
1767 if meta.bootstrap.git.market_name:1767 if type(data) is not str and data.get("short_description"):
1768 market_name = data.get("short_description")
1769 elif meta.bootstrap.git.market_name:
1768 market_name = meta.bootstrap.git.market_name1770 market_name = meta.bootstrap.git.market_name
1769 elif meta.oem.git.market_name:1771 elif meta.oem.git.market_name:
1770 market_name = meta.oem.git.market_name1772 market_name = meta.oem.git.market_name
@@ -1808,7 +1810,9 @@ def collect_pkg_info(
1808 pkgInfo[pkg_name].old_desc = f"Stella {codename.title()} platform"1810 pkgInfo[pkg_name].old_desc = f"Stella {codename.title()} platform"
1809 pkgInfo[pkg_name].new_desc = new_desc1811 pkgInfo[pkg_name].new_desc = new_desc
18101812
1811 if meta.bootstrap.git.market_name:1813 if type(data) is not str and data.get("short_description"):
1814 market_name = data.get("short_description")
1815 elif meta.bootstrap.git.market_name:
1812 market_name = meta.bootstrap.git.market_name1816 market_name = meta.bootstrap.git.market_name
1813 elif meta.oem.git.market_name:1817 elif meta.oem.git.market_name:
1814 market_name = meta.oem.git.market_name1818 market_name = meta.oem.git.market_name
@@ -1857,7 +1861,9 @@ def collect_pkg_info(
1857 pkgInfo[pkg_name].old_desc = f"Sutton {codename.title()} platform"1861 pkgInfo[pkg_name].old_desc = f"Sutton {codename.title()} platform"
1858 pkgInfo[pkg_name].new_desc = new_desc1862 pkgInfo[pkg_name].new_desc = new_desc
18591863
1860 if meta.bootstrap.git.market_name:1864 if type(data) is not str and data.get("short_description"):
1865 market_name = data.get("short_description")
1866 elif meta.bootstrap.git.market_name:
1861 market_name = meta.bootstrap.git.market_name1867 market_name = meta.bootstrap.git.market_name
1862 elif meta.oem.git.market_name:1868 elif meta.oem.git.market_name:
1863 market_name = meta.oem.git.market_name1869 market_name = meta.oem.git.market_name

Subscribers

People subscribed via source and target branches