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: 0cdb089143cd8efda3ce879353f95b4f37ed3565
Merged at revision: 7770ab8f2ce03b72d2681d2d054604bb8a6c4f4f
Proposed branch: ~fourdollars/pc-enablement/+git/oem-scripts:master
Merge into: ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master
Diff against target: 150 lines (+39/-10)
4 files modified
debian/tests/mir-bug (+25/-0)
mir-bug (+10/-7)
oem-meta-package.mir.jinja2 (+1/-1)
oem_scripts/__init__.py (+3/-2)
Reviewer Review Type Date Requested Status
Yao Wei Approve
Review via email: mp+435742@code.launchpad.net
To post a comment you must log in.
Revision history for this message
OEM Taipei Bot (oem-taipei-bot) wrote :

[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 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.61-f3aa297-in-linux-container-jammy

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

[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 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.61-0e2d100-in-linux-container-jammy

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

[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 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.61-445ef5b-in-linux-container-jammy

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

[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.61-0cdb089-in-linux-container-jammy

Revision history for this message
Yao Wei (medicalwei) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/tests/mir-bug b/debian/tests/mir-bug
2index 04c8b9d..cc0c26a 100644
3--- a/debian/tests/mir-bug
4+++ b/debian/tests/mir-bug
5@@ -27,6 +27,27 @@ cat > "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json <<ENDLINE
6 "series": "focal"
7 }
8 ENDLINE
9+cat > "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json <<ENDLINE
10+{
11+ "certification-hardware": [
12+ "202112-29761",
13+ "202112-29762",
14+ "202112-29763",
15+ "202112-29800",
16+ "202112-29801",
17+ "202112-29802"
18+ ],
19+ "certify-planning": [
20+ 1965841
21+ ],
22+ "metabug": 1968569,
23+ "mirbug": 1981784,
24+ "productnames": [
25+ "XPS 13 9320"
26+ ],
27+ "series": "jammy"
28+}
29+ENDLINE
30
31 export COPYRIGHT_YEAR=2022
32
33@@ -42,6 +63,10 @@ cleanup() {
34 trap cleanup EXIT INT TERM
35
36 # check/update
37+mir-bug update --yes --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
38+mir-bug check --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
39+mir-bug update --yes --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
40+mir-bug check --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
41 mir-bug update --yes --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
42 mir-bug check --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
43 mir-bug update --yes --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
44diff --git a/mir-bug b/mir-bug
45index a0e9ca8..3bc673f 100755
46--- a/mir-bug
47+++ b/mir-bug
48@@ -394,7 +394,7 @@ def update_bug(
49 task.importance = "Critical"
50 task.lp_save()
51
52- update_bug_status(bug, pkg_name, yes)
53+ update_bug_status(bug, pkg_name, yes, series)
54
55 check_and_update_bug_subscriptions(lp, bug, update=True, yes=yes)
56
57@@ -458,7 +458,7 @@ def check_bug(
58 need_fixing = True
59 if check_bug_importance(bug) is False:
60 need_fixing = True
61- if check_bug_status(bug, pkg_name) is False:
62+ if check_bug_status(bug, pkg_name, series) is False:
63 need_fixing = True
64 if check_and_update_bug_subscriptions(lp, bug) is False:
65 need_fixing = True
66@@ -585,7 +585,7 @@ def _expected_status(target_name: str, status: str, expected: str) -> bool:
67 return True
68
69
70-def check_bug_status(bug, pkg_name: str) -> bool:
71+def check_bug_status(bug, pkg_name: str, series: str) -> bool:
72 info("Checking bug status...")
73 result = True
74 saw_ubuntu_task = False
75@@ -606,7 +606,7 @@ def check_bug_status(bug, pkg_name: str) -> bool:
76 elif (
77 task.bug_target_name == "ubuntu"
78 or f"{pkg_name} (Ubuntu)" in task.bug_target_name
79- or f"{pkg_name} (Ubuntu Focal)" in task.bug_target_name
80+ or f"{pkg_name} (Ubuntu {series.capitalize()})" in task.bug_target_name
81 ):
82 saw_ubuntu_task = True
83 if args.release:
84@@ -658,7 +658,7 @@ def _change_task_status(task, new_status: str, yes: bool) -> bool:
85 task.lp_save()
86
87
88-def update_bug_status(bug, pkg_name: str, yes: bool) -> None:
89+def update_bug_status(bug, pkg_name: str, yes: bool, series: str) -> None:
90 info("Updating bug status...")
91 saw_ubuntu_task = False
92 for bug_task in bug.bug_tasks:
93@@ -670,7 +670,7 @@ def update_bug_status(bug, pkg_name: str, yes: bool) -> None:
94 elif (
95 bug_task.bug_target_name == "ubuntu"
96 or f"{pkg_name} (Ubuntu)" in bug_task.bug_target_name
97- or f"{pkg_name} (Ubuntu Focal)" in bug_task.bug_target_name
98+ or f"{pkg_name} (Ubuntu {series.capitalize()})" in bug_task.bug_target_name
99 ):
100 saw_ubuntu_task = True
101 if args.release:
102@@ -929,7 +929,9 @@ def check_and_update_git_repo(
103
104 if series != "focal":
105 result = pattern2.match(f"[MIR][{series}] {pkg_name}")
106- platform = result.group(2)
107+ project = result.group(2)
108+ platform = result.group(3)
109+ group = None
110 if bootstrap:
111 suffix = "ubuntu"
112 else:
113@@ -1190,6 +1192,7 @@ def read_from_template(metaPkgName, branchName, oemCodenameNogroup, deviceName,
114 oemCodenameNogroup=oemCodenameNogroup,
115 deviceName=deviceName,
116 version=version,
117+ series=series,
118 )
119
120
121diff --git a/oem-meta-package.mir.jinja2 b/oem-meta-package.mir.jinja2
122index 6c44b08..62aaba0 100644
123--- a/oem-meta-package.mir.jinja2
124+++ b/oem-meta-package.mir.jinja2
125@@ -21,7 +21,7 @@ Most potential regressions will live in the package set that will be installed v
126
127 [Availability]
128 This is a meta package for https://wiki.ubuntu.com/MIRTeam/Exceptions/OEM that means the package doesn't exist in Debian or Ubuntu archive yet.
129-The source code of the {{ metaPkgName }} for focal:
130+The source code of the {{ metaPkgName }} for {{ series }}:
131 git clone -b {{ branchName }} https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-{{ oemCodenameNogroup }}-projects-meta
132
133 [Rationale]
134diff --git a/oem_scripts/__init__.py b/oem_scripts/__init__.py
135index c6b789d..fc3f69c 100644
136--- a/oem_scripts/__init__.py
137+++ b/oem_scripts/__init__.py
138@@ -32,9 +32,10 @@ ALLOWED_KERNEL_META_LIST = (
139 "linux-oem-20.04c",
140 "linux-oem-20.04b",
141 "linux-oem-20.04",
142- "linux-oem-22.04a",
143- "linux-oem-22.04b",
144 "linux-oem-22.04c",
145+ "linux-oem-22.04b",
146+ "linux-oem-22.04a",
147+ "linux-oem-22.04",
148 "linux-generic-hwe-20.04",
149 "linux-generic-hwe-22.04",
150 "linux-generic",

Subscribers

People subscribed via source and target branches