Merge autopkgtest-cloud:mirror-region into autopkgtest-cloud:master

[Brian Murray]

Allow using a mirror-$REGION.rc file (e.g. mirror-bos01.rc) on a cloud-worker unit to specify the mirror so that we can use different mirrors for different data centers when necessary. This has the advantage that we will be able to just add / remove a file on the unit and not have to update the charms.

This is a follow up to the failed hack MP in https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/438808.

[Brian Murray (brian-murray)]

I realize there is a white space change here but it is actually consistent with items later on.

[Paride Legovini (paride)]

LGTM

review: Approve

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
index 640a843..be6b4d3 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
@@ -11,14 +11,14 @@ if [ -z "${RELEASE}" ] || [ -z "${REGION}" ] || [ -z "${ARCH}" ]; then
         exit 1
 fi
 
-[ -z "${MIRROR:-}" ] && . ~/mirror.rc
-export MIRROR
-
 if [ -z "${MIRROR:-}" ]; then
-       if [ "${REGION}" == "bos01" ]  || [ "${REGION}" == "bos02" ]; then
-                MIRROR=http://us.archive.ubuntu.com/ubuntu/
-       fi
+        if [ -e ~/mirror-${REGION}.rc ]; then
+                . ~/mirror-${REGION}.rc
+        else
+                . ~/mirror.rc
+        fi
 fi
+export MIRROR
 
 [ -z "${NET_NAME:-}" ] && . ~/net-name.rc
 export NET_NAME