Merge ~ycheng-twn/pc-enablement/+git/oem-scripts:0002_umadision into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Yuan-Chen Cheng]

add umadision to query debian site with ubuntu distro which is more than 1 time faster.

[Shih-Yuan Lee (fourdollars)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 378680c..8342b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
 oem-scripts (0.99) UNRELEASED; urgency=medium
 
+  [ Yuan-Chen Cheng]
   * launchpad-api: refine message and add handy test.
-
- -- Yuan-Chen Cheng <[e-mail]>  Fri, 04 Jun 2021 13:00:53 +0800
+  * umadision, debian/links, setup.py, tests/test_flake8: add script to
+    query qa.debian for ubuntu pkg because it response faster.
+
+  [ Jeremy Szu ]
+  * recovery-from-iso.sh: with stella image support.
+    Need to use the image build after pc-stella-cmit-focal-amd64-X00-20210617-1562.iso
+    because the ubuntu recovery needs to support recovery_type=dev.
+    This patch is just for supporting re-deploy, the auto sanity check
+    will be supported in the future.
+    Inject ssh key, nopasswd for automation
+
+ -- Yuan-Chen Cheng <[e-mail]>  Wed, 07 Jul 2021 11:37:50 +0800
 
 oem-scripts (0.98) focal; urgency=medium
 
diff --git a/debian/links b/debian/links
index e77a689..327b5c7 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,4 @@
 /usr/bin/pkg-oem-meta /usr/bin/pkg-somerville-meta
 /usr/bin/pkg-oem-meta /usr/bin/pkg-stella-meta
 /usr/bin/pkg-oem-meta /usr/bin/pkg-sutton-meta
+/usr/bin/umadision /usr/bin/dmadision
diff --git a/setup.py b/setup.py
index f944b38..e9054ce 100644
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@ Also there is a meta package oem-dev-tools that installs all scripts""",
         "bug-bind.py",
         "mir-bug",
         "check-ssid-duplicated.sh",
+        "umadision"
     ],
     packages=find_packages(),
     data_files=[("share/oem-scripts", ["config.sh"])],
diff --git a/tests/test_flake8 b/tests/test_flake8
index deb8ef0..6447121 100755
--- a/tests/test_flake8
+++ b/tests/test_flake8
@@ -11,4 +11,5 @@ flake8 --ignore E501,W503,E203 \
     pkg-list \
     pkg-oem-meta \
     review-merge-proposal \
-    setup.py
+    setup.py \
+    umadision
diff --git a/umadision b/umadision
 new file mode 100755
index 0000000..7694aa4
--- /dev/null
+++ b/umadision
@@ -0,0 +1,34 @@
+#!/usr/bin/python3
+
+import requests
+import sys
+
+
+def usage():
+    print("umadision DEB_PKG_NAME")
+    print("Query qa.debian.org for ubuntu pkg version")
+    print()
+    print("dmadision DEB_PKG_NAME")
+    print("Query qa.debian.org for debian pkg version")
+
+
+if len(sys.argv) != 2:
+    usage()
+    sys.exit(0)
+
+pkg = sys.argv[1]
+dist = "ubuntu"
+if "dmadision" in sys.argv[0]:
+    dist = "debian"
+
+url = f"https://qa.debian.org/madison.php?package={pkg}&table={dist}&text=on"
+
+r = requests.get(url)
+
+if r.status_code == requests.codes.ok:
+    pass
+else:
+    print("Get f{url} failed")
+    sys.exit(-1)
+
+print(r.text)