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

[Shih-Yuan Lee]

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-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

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.30-05de5a6-in-linux-container-focal

[Yuan-Chen Cheng (ycheng-twn)]

LGTM

review: Approve

diff --git a/debian/tests/setup-apt-dir b/debian/tests/setup-apt-dir
index b46d790..272c700 100644
--- a/debian/tests/setup-apt-dir
+++ b/debian/tests/setup-apt-dir
@@ -45,18 +45,20 @@ else
     exit 1
 fi
 
-setup-apt-dir.sh -c focal -m http://archive.ubuntu.com/ubuntu --i386 -o aptdir.log
-if [ ! -e aptdir.log ]; then
-    echo "aptdir.log doesn't exist."
-    exit 1
-fi
-APTDIR="$(cat aptdir.log)"
-if [ -n "$APTDIR" ] && [ -d "$APTDIR" ] && [[ "$APTDIR" =~ ^/tmp/apt\. ]]; then
-    apt-cache -o "Dir=$APTDIR" -o "Dir::State::status=$APTDIR/var/lib/dpkg/status" policy libc6:i386 | grep libc6:i386
-    rm -fr "$APTDIR" aptdir.log
-else
-    echo "APTDIR = '$APTDIR' invalid."
-    exit 1
-fi
+for series in xenial bionic focal jammy; do
+    setup-apt-dir.sh -c "$series" -m http://archive.ubuntu.com/ubuntu --i386 -o aptdir.log
+    if [ ! -e aptdir.log ]; then
+        echo "aptdir.log doesn't exist."
+        exit 1
+    fi
+    APTDIR="$(cat aptdir.log)"
+    if [ -n "$APTDIR" ] && [ -d "$APTDIR" ] && [[ "$APTDIR" =~ ^/tmp/apt\. ]]; then
+        apt-cache -o "Dir=$APTDIR" -o "Dir::State::status=$APTDIR/var/lib/dpkg/status" policy libc6:i386 | grep libc6:i386
+        rm -fr "$APTDIR" aptdir.log
+    else
+        echo "APTDIR = '$APTDIR' invalid."
+        exit 1
+    fi
+done
 
 exit 0
diff --git a/setup-apt-dir.sh b/setup-apt-dir.sh
index 67adf99..cd55412 100755
--- a/setup-apt-dir.sh
+++ b/setup-apt-dir.sh
@@ -176,7 +176,7 @@ if [ "${#PPA[@]}" != "0" ]; then
 fi
 
 case "${CODENAME}" in
-    (bionic|focal)
+    (xenial|bionic|focal)
         PUBKEY="790BC7277767219C42C86F933B4FE6ACC0B21F32"
         ;;
     (hirsute|impish|jammy)
@@ -184,6 +184,7 @@ case "${CODENAME}" in
         ;;
     (*)
         echo "${CODENAME} is not supported by setup-apt-dir.sh yet."
+        exit 1
         ;;
 esac