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
diff --git a/debian/tests/mir-bug b/debian/tests/mir-bug
index 04c8b9d..cc0c26a 100644
--- a/debian/tests/mir-bug
+++ b/debian/tests/mir-bug
@@ -27,6 +27,27 @@ cat > "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json <<ENDLINE
27 "series": "focal"27 "series": "focal"
28}28}
29ENDLINE29ENDLINE
30cat > "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json <<ENDLINE
31{
32 "certification-hardware": [
33 "202112-29761",
34 "202112-29762",
35 "202112-29763",
36 "202112-29800",
37 "202112-29801",
38 "202112-29802"
39 ],
40 "certify-planning": [
41 1965841
42 ],
43 "metabug": 1968569,
44 "mirbug": 1981784,
45 "productnames": [
46 "XPS 13 9320"
47 ],
48 "series": "jammy"
49}
50ENDLINE
3051
31export COPYRIGHT_YEAR=202252export COPYRIGHT_YEAR=2022
3253
@@ -42,6 +63,10 @@ cleanup() {
42trap cleanup EXIT INT TERM63trap cleanup EXIT INT TERM
4364
44# check/update65# check/update
66mir-bug update --yes --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
67mir-bug check --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
68mir-bug update --yes --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
69mir-bug check --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/jellyfish-tentacool.json
45mir-bug update --yes --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json70mir-bug update --yes --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
46mir-bug check --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json71mir-bug check --skip --ready --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
47mir-bug update --yes --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json72mir-bug update --yes --skip --tz=UTC --release "$AUTOPKGTEST_ARTIFACTS"/fossa-tentacool.json
diff --git a/mir-bug b/mir-bug
index a0e9ca8..3bc673f 100755
--- a/mir-bug
+++ b/mir-bug
@@ -394,7 +394,7 @@ def update_bug(
394 task.importance = "Critical"394 task.importance = "Critical"
395 task.lp_save()395 task.lp_save()
396396
397 update_bug_status(bug, pkg_name, yes)397 update_bug_status(bug, pkg_name, yes, series)
398398
399 check_and_update_bug_subscriptions(lp, bug, update=True, yes=yes)399 check_and_update_bug_subscriptions(lp, bug, update=True, yes=yes)
400400
@@ -458,7 +458,7 @@ def check_bug(
458 need_fixing = True458 need_fixing = True
459 if check_bug_importance(bug) is False:459 if check_bug_importance(bug) is False:
460 need_fixing = True460 need_fixing = True
461 if check_bug_status(bug, pkg_name) is False:461 if check_bug_status(bug, pkg_name, series) is False:
462 need_fixing = True462 need_fixing = True
463 if check_and_update_bug_subscriptions(lp, bug) is False:463 if check_and_update_bug_subscriptions(lp, bug) is False:
464 need_fixing = True464 need_fixing = True
@@ -585,7 +585,7 @@ def _expected_status(target_name: str, status: str, expected: str) -> bool:
585 return True585 return True
586586
587587
588def check_bug_status(bug, pkg_name: str) -> bool:588def check_bug_status(bug, pkg_name: str, series: str) -> bool:
589 info("Checking bug status...")589 info("Checking bug status...")
590 result = True590 result = True
591 saw_ubuntu_task = False591 saw_ubuntu_task = False
@@ -606,7 +606,7 @@ def check_bug_status(bug, pkg_name: str) -> bool:
606 elif (606 elif (
607 task.bug_target_name == "ubuntu"607 task.bug_target_name == "ubuntu"
608 or f"{pkg_name} (Ubuntu)" in task.bug_target_name608 or f"{pkg_name} (Ubuntu)" in task.bug_target_name
609 or f"{pkg_name} (Ubuntu Focal)" in task.bug_target_name609 or f"{pkg_name} (Ubuntu {series.capitalize()})" in task.bug_target_name
610 ):610 ):
611 saw_ubuntu_task = True611 saw_ubuntu_task = True
612 if args.release:612 if args.release:
@@ -658,7 +658,7 @@ def _change_task_status(task, new_status: str, yes: bool) -> bool:
658 task.lp_save()658 task.lp_save()
659659
660660
661def update_bug_status(bug, pkg_name: str, yes: bool) -> None:661def update_bug_status(bug, pkg_name: str, yes: bool, series: str) -> None:
662 info("Updating bug status...")662 info("Updating bug status...")
663 saw_ubuntu_task = False663 saw_ubuntu_task = False
664 for bug_task in bug.bug_tasks:664 for bug_task in bug.bug_tasks:
@@ -670,7 +670,7 @@ def update_bug_status(bug, pkg_name: str, yes: bool) -> None:
670 elif (670 elif (
671 bug_task.bug_target_name == "ubuntu"671 bug_task.bug_target_name == "ubuntu"
672 or f"{pkg_name} (Ubuntu)" in bug_task.bug_target_name672 or f"{pkg_name} (Ubuntu)" in bug_task.bug_target_name
673 or f"{pkg_name} (Ubuntu Focal)" in bug_task.bug_target_name673 or f"{pkg_name} (Ubuntu {series.capitalize()})" in bug_task.bug_target_name
674 ):674 ):
675 saw_ubuntu_task = True675 saw_ubuntu_task = True
676 if args.release:676 if args.release:
@@ -929,7 +929,9 @@ def check_and_update_git_repo(
929929
930 if series != "focal":930 if series != "focal":
931 result = pattern2.match(f"[MIR][{series}] {pkg_name}")931 result = pattern2.match(f"[MIR][{series}] {pkg_name}")
932 platform = result.group(2)932 project = result.group(2)
933 platform = result.group(3)
934 group = None
933 if bootstrap:935 if bootstrap:
934 suffix = "ubuntu"936 suffix = "ubuntu"
935 else:937 else:
@@ -1190,6 +1192,7 @@ def read_from_template(metaPkgName, branchName, oemCodenameNogroup, deviceName,
1190 oemCodenameNogroup=oemCodenameNogroup,1192 oemCodenameNogroup=oemCodenameNogroup,
1191 deviceName=deviceName,1193 deviceName=deviceName,
1192 version=version,1194 version=version,
1195 series=series,
1193 )1196 )
11941197
11951198
diff --git a/oem-meta-package.mir.jinja2 b/oem-meta-package.mir.jinja2
index 6c44b08..62aaba0 100644
--- a/oem-meta-package.mir.jinja2
+++ b/oem-meta-package.mir.jinja2
@@ -21,7 +21,7 @@ Most potential regressions will live in the package set that will be installed v
2121
22[Availability]22[Availability]
23This 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.23This 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.
24The source code of the {{ metaPkgName }} for focal:24The source code of the {{ metaPkgName }} for {{ series }}:
25 git clone -b {{ branchName }} https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-{{ oemCodenameNogroup }}-projects-meta25 git clone -b {{ branchName }} https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-{{ oemCodenameNogroup }}-projects-meta
2626
27[Rationale]27[Rationale]
diff --git a/oem_scripts/__init__.py b/oem_scripts/__init__.py
index c6b789d..fc3f69c 100644
--- a/oem_scripts/__init__.py
+++ b/oem_scripts/__init__.py
@@ -32,9 +32,10 @@ ALLOWED_KERNEL_META_LIST = (
32 "linux-oem-20.04c",32 "linux-oem-20.04c",
33 "linux-oem-20.04b",33 "linux-oem-20.04b",
34 "linux-oem-20.04",34 "linux-oem-20.04",
35 "linux-oem-22.04a",
36 "linux-oem-22.04b",
37 "linux-oem-22.04c",35 "linux-oem-22.04c",
36 "linux-oem-22.04b",
37 "linux-oem-22.04a",
38 "linux-oem-22.04",
38 "linux-generic-hwe-20.04",39 "linux-generic-hwe-20.04",
39 "linux-generic-hwe-22.04",40 "linux-generic-hwe-22.04",
40 "linux-generic",41 "linux-generic",

Subscribers

People subscribed via source and target branches