Merge autopkgtest-cloud:use-us-archive into autopkgtest-cloud:master

[Brian Murray]

The link to ftpmaster.internal is very slow from both bos01 and bos02 (RT 156412) so let's work around it by using us.archive.ubuntu.com.

[Brian Murray (brian-murray)]

I'm pretty sure this will work.

[Steve Langasek (vorlon)]

Is it better to push this in image creation time or via cloud-init?

[Brian Murray (brian-murray)]

AFAIK we only use a cloud-init user data file for the armhf images.

[Steve Langasek (vorlon)]

review: Approve

[Brian Murray (brian-murray)]

For the record I should have actually tested this before submitting an MP because this is ****. I've cowboy'ed something that actually works in production. I'm gonna blame it on still having vacation brain.

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 68b8665..640a843 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
@@ -14,6 +14,12 @@ 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
+fi
+
 [ -z "${NET_NAME:-}" ] && . ~/net-name.rc
 export NET_NAME