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

[Shih-Yuan Lee]

[Shih-Yuan Lee (fourdollars)]

[BOT]
$ cat oem-scripts-1.9-58b7530-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
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS
mir-bug-verification PASS
https://paste.ubuntu.com/p/3K8fwd6Nzb/ oem-scripts-1.9-58b7530-in-docker-focal-complete.log

[Yuan-Chen Cheng (ycheng-twn)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 38037d5..9c26c3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+oem-scripts (1.9) UNRELEASED; urgency=medium
+
+  * mir-bug: Support the oem-needs-upload and oem-done-upload tags.
+  * debian/tests/launchpad-api,
+    launchpad-api: Correct the return code when using `launchpad-api get`
+    failed.
+
+ -- Shih-Yuan Lee (FourDollars) <[e-mail]>  Wed, 18 Aug 2021 14:30:31 +0800
+
 oem-scripts (1.8) focal; urgency=medium
 
   * debian/tests/mir-bug,
diff --git a/debian/tests/launchpad-api b/debian/tests/launchpad-api
index ff71689..d1b4909 100644
--- a/debian/tests/launchpad-api
+++ b/debian/tests/launchpad-api
@@ -2,7 +2,13 @@
 
 export LAUNCHPAD_API="https://api.staging.launchpad.net/"
 
+# LP: #2 doesn't exist so it should return failed.
+if launchpad-api get bugs/2 2>&1; then
+    exit 1
+fi
+
 launchpad-api patch bugs/100 tags:='["focal"]'
+
 if [ "$(launchpad-api get bugs/100 | jq -r '.tags|join(" ")')" != "focal" ]; then
     exit 1
 fi
diff --git a/launchpad-api b/launchpad-api
index aa4001e..e6f958c 100755
--- a/launchpad-api
+++ b/launchpad-api
@@ -31,6 +31,9 @@ usage_auth_failed()
 It could be command error OR your authentication token is removed or expired.
 If you think it's the authentication issue, you can try to backup/remove
 the config.ini, get authentication token and try again.
+If it still failed, it could be a server side issue.
+
+launchpad-api is just a shell script wrapper for https://api.launchpad.net/.
 
 Ex:
 
@@ -124,7 +127,7 @@ get_api()
         oauth_timestamp=="$(date +%s)" \
         oauth_token=="${oauth_token}" \
         oauth_version=="1.0" \
-        "$@" || ( usage_auth_failed ; usage )
+        "$@" || ( usage_auth_failed ; usage ; false )
 }
 
 patch_api()
diff --git a/mir-bug b/mir-bug
index 715aac1..74ec3c2 100755
--- a/mir-bug
+++ b/mir-bug
@@ -456,7 +456,12 @@ def update_bug(
     if check_bug_tags(bug, certified) is False:
         tags = copy(bug.tags)
         if certified:
-            taglist = TAG_LIST + ["ubuntu-certified"]
+            if args.release:
+                taglist = TAG_LIST + ["ubuntu-certified", "oem-done-upload"]
+            elif args.ready:
+                taglist = TAG_LIST + ["ubuntu-certified", "oem-needs-upload"]
+            else:
+                taglist = TAG_LIST + ["ubuntu-certified"]
         else:
             taglist = TAG_LIST
         for tag in taglist:
@@ -470,6 +475,9 @@ def update_bug(
                 if tag[len("oem-scripts-") :] != oem_scripts.__version__:
                     if yes_or_ask(yes, f"Do you want to remove '{tag}' tag?"):
                         tags.remove(tag)
+            elif certified and args.release and tag == "oem-needs-upload":
+                if yes_or_ask(yes, f"Do you want to remove '{tag}' tag?"):
+                    tags.remove(tag)
         if tags != bug.tags:
             bug.tags = tags
 
@@ -786,7 +794,12 @@ def check_bug_tags(bug, certified: bool = False) -> bool:
     info("Checking bug tags...")
     result = True
     if certified:
-        taglist = TAG_LIST + ["ubuntu-certified"]
+        if args.release:
+            taglist = TAG_LIST + ["ubuntu-certified", "oem-done-upload"]
+        elif args.ready:
+            taglist = TAG_LIST + ["ubuntu-certified", "oem-needs-upload"]
+        else:
+            taglist = TAG_LIST + ["ubuntu-certified"]
     else:
         taglist = TAG_LIST
     for tag in taglist: