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

[Shih-Yuan Lee]

Two commits are related to the i2c SSID fixes for Dell and HP.

mir-bug: Fix the SSID parsing issue for the i2c device.
debian/tests/pkg-stella-meta, pkg-oem-meta: Make the modalias pattern to match the subsystem ID of the i2c device.

Others are fixes for the installation and tests of new tools.

debian/tests/control, debian/tests/recovery-from-iso.sh, setup.py: Add the test and fix the installation for recovery-from-iso.sh.
debian/tests/control, debian/tests/review-merge-proposal, setup.py: Add the test and fix the installation for review-merge-proposal.

[Shih-Yuan Lee (fourdollars)]

[BOT]
$ cat oem-scripts-0.82-d9b9563-in-docker-focal-summary.log
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
mir-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
git-url-insteadof-setting PASS
recovery-from-iso.sh PASS
mir-bug-verification PASS
https://paste.ubuntu.com/p/zYs6sNx8J3/ oem-scripts-0.82-d9b9563-in-docker-focal-complete.log

[jeremyszu (os369510)]

Asked by AlexT

>>btw, I would like to past the confirmation from HP on that MP as a record...... @jeremysu ^ could you have a review on it and past the confirmation from HP as a record?

https://drive.google.com/file/d/12ggYZZMe0TzwXmplHcRPyOnqpNtFIKkF/view?usp=sharing

[Alex Tu (alextu)]

the part HP confirmed on the mail attached by Jeremyszu.

mail title: [Stella][HP CMIT] SSID for Ionian13, Ionian14 and Ionian15

Burrell, Jeff William (Z Desktop Workstations R&D - Linux team) <email address hidden> Thu, Apr 1, 2021 at 1:54 AM
To: Chih-Hsyuan Ho <email address hidden>, Alex Tu <email address hidden>
Cc: "Lopez, Jorge A (Thin Clients)" <email address hidden>, Jeremy Szu <email address hidden>, "Hamaguchi, Jun" <email address hidden>, Stella
<email address hidden>, Stephane Verdy <email address hidden>, "Verma, Jatin" <email address hidden>, Rex Tsai <email address hidden>, "Van Farowe,
Paul Robert" <email address hidden>
Chih,
I discussed this with the dtWS BIOS lead and he has no concerns over your approach.
Jeff

[Alex Tu (alextu)]

LGTM.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 199fa08..4f5044c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+oem-scripts (0.82) UNRELEASED; urgency=medium
+
+  * debian/tests/control,
+    debian/tests/review-merge-proposal,
+    setup.py: Add the test and fix the installation for review-merge-proposal.
+  * debian/tests/pkg-stella-meta,
+    pkg-oem-meta: Make the modalias pattern to match the subsystem ID of the
+    i2c device.
+  * debian/tests/control,
+    debian/tests/recovery-from-iso.sh,
+    setup.py: Add the test and fix the installation for recovery-from-iso.sh.
+  * mir-bug: Fix the SSID parsing issue for the i2c device.
+
+ -- Shih-Yuan Lee (FourDollars) <[e-mail]>  Fri, 09 Apr 2021 14:12:57 +0800
+
 oem-scripts (0.81) focal; urgency=medium
 
   * debian/tests/pkg-somerville-meta,
diff --git a/debian/tests/control b/debian/tests/control
index ac14090..0b6b61d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -18,12 +18,14 @@ Tests:
  mir-bug,
  oem-meta-packages,
  pkg-list,
+ review-merge-proposal,
  run-autopkgtest,
  setup-apt-dir
 Depends: @
 
 Tests:
- git-url-insteadof-setting
+ git-url-insteadof-setting,
+ recovery-from-iso.sh
 Depends: @
 Restrictions: allow-stderr
 
diff --git a/debian/tests/pkg-stella-meta b/debian/tests/pkg-stella-meta
index 55583ee..1d26c5c 100644
--- a/debian/tests/pkg-stella-meta
+++ b/debian/tests/pkg-stella-meta
@@ -32,7 +32,7 @@ grep "^apt-get autoremove --purge --yes oem-stella.cmit-ivysaur-meta$" debian/te
 
 grep "Upstream-Name: oem-stella.cmit-ivysaur-meta" debian/copyright
 
-grep "alias pci:\*sv0000103Csd00008750\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
+grep "alias pci:\*sv0000103Csd00008750bc0Csc05\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
 
 git checkout cmit.ivysaur-focal-oem
 
@@ -55,4 +55,4 @@ grep "^apt-get autoremove --purge --yes oem-stella.cmit-ivysaur-meta$" debian/te
 
 grep "Upstream-Name: oem-stella.cmit-ivysaur-meta" debian/copyright
 
-grep "alias pci:\*sv0000103Csd00008750\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
+grep "alias pci:\*sv0000103Csd00008750bc0Csc05\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
diff --git a/debian/tests/recovery-from-iso.sh b/debian/tests/recovery-from-iso.sh
 new file mode 100644
index 0000000..376f242
--- /dev/null
+++ b/debian/tests/recovery-from-iso.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+recovery-from-iso.sh --help || true
diff --git a/debian/tests/review-merge-proposal b/debian/tests/review-merge-proposal
 new file mode 100644
index 0000000..3e0cdaf
--- /dev/null
+++ b/debian/tests/review-merge-proposal
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+review-merge-proposal --help
diff --git a/mir-bug b/mir-bug
index f53f1d1..dee3a25 100755
--- a/mir-bug
+++ b/mir-bug
@@ -683,9 +683,9 @@ def _get_items_from_git(project: str, branch: str, pkg_name: str) -> tuple:
         git_dir = os.path.join(tmpdir, pkg_name)
 
         if project == 'somerville':
-            prog = re.compile(r"alias pci:\*sv00001028sd0000(\w+)\* meta (.*)")
+            prog = re.compile(r"alias pci:\*sv00001028sd0000([0-9A-F]{4})[^ ]* meta (.*)")
         elif project == 'stella':
-            prog = re.compile(r"alias pci:\*sv0000103Csd0000(\w+)\* meta (.*)")
+            prog = re.compile(r"alias pci:\*sv0000103Csd0000([0-9A-F]{4})[^ ]* meta (.*)")
         else:
             prog = re.compile(r"alias dmi:\*bvn([0-9a-zA-Z]+):bvr([0-9a-zA-Z]{3})\* meta (.*)")
 
diff --git a/pkg-oem-meta b/pkg-oem-meta
index 3eeb1e7..64b1421 100755
--- a/pkg-oem-meta
+++ b/pkg-oem-meta
@@ -347,7 +347,7 @@ License: GPL-3
                         .format(bios_id.upper(), meta))
         elif 'sd_id' in vars(args).keys():
             for sd_id in args.sd_id:
-                f.write("alias pci:*sv0000103Csd0000{0}* meta {1}\n"
+                f.write("alias pci:*sv0000103Csd0000{0}bc0Csc05* meta {1}\n"
                         .format(sd_id.upper(), meta))
         elif 'bios_ver' in vars(args).keys():
             for bios_ver in args.bios_ver:
diff --git a/setup.py b/setup.py
index 7984690..e93bd77 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,9 @@ Also there is a meta package oem-dev-tools that installs all scripts''',
           'oem-meta-packages',
           'pkg-list',
           'pkg-oem-meta',
+          'recovery-from-iso.sh',
           'rename-everything.py',
+          'review-merge-proposal',
           'run-autopkgtest',
           'setup-apt-dir.sh',
           'setup4test.sh',