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 FAIL non-zero exit status 1
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.29-fc9d3fa-in-linux-container-focal

[Yuan-Chen Cheng (ycheng-twn)]

LGTM

review: Approve

[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.29-7af06c3-in-linux-container-focal

diff --git a/debian/tests/setup-apt-dir b/debian/tests/setup-apt-dir
index f2fa1b5..b46d790 100644
--- a/debian/tests/setup-apt-dir
+++ b/debian/tests/setup-apt-dir
@@ -2,6 +2,8 @@
 
 export LAUNCHPAD_TOKEN="::"
 
+setup-apt-dir.sh -c jammy -m http://archive.ubuntu.com/ubuntu --disable-updates --disable-backports -o aptdir.log
+rm -f aptdir.log
 setup-apt-dir.sh -c focal -m http://archive.ubuntu.com/ubuntu --disable-updates --disable-backports -o aptdir.log
 if [ ! -e aptdir.log ]; then
     echo "aptdir.log doesn't exist."
diff --git a/setup-apt-dir.sh b/setup-apt-dir.sh
index 2c999e3..67adf99 100755
--- a/setup-apt-dir.sh
+++ b/setup-apt-dir.sh
@@ -175,7 +175,17 @@ if [ "${#PPA[@]}" != "0" ]; then
     done< <(get-private-ppa "${PPA[@]}")
 fi
 
-PUBKEY="790BC7277767219C42C86F933B4FE6ACC0B21F32"
+case "${CODENAME}" in
+    (bionic|focal)
+        PUBKEY="790BC7277767219C42C86F933B4FE6ACC0B21F32"
+        ;;
+    (hirsute|impish|jammy)
+        PUBKEY="F6ECB3762474EDA9D21B7022871920D1991BC93C"
+        ;;
+    (*)
+        echo "${CODENAME} is not supported by setup-apt-dir.sh yet."
+        ;;
+esac
 
 : > "$APTDIR/etc/apt/sources.list"