Merge autopkgtest-cloud:cninr-autopkgtest into autopkgtest-cloud:master

[Brian Murray]

We switched from using m1.small to autopkgtest (as that is an available flavor in lcy02, unlike m1.small) so we should make sure create-nova-image-new-release will work in October!

[Tim Andersson (andersson123)]

charms/focal/autopkgtest-cloud-worker/config.yaml: default: "m1.small"
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker.conf:package_size_default = m1.small

The string also occurs in the above files, do we need to change that too or will that happen later?

[Tim Andersson (andersson123)]

review: Approve

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release
index 444d919..bc51ff1 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release
@@ -73,13 +73,13 @@ NET_ID=${id}
 
 retries=20
 while true; do
-    eval "$(openstack server create -f shell --flavor m1.small --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID})"
+    eval "$(openstack server create -f shell --flavor autopkgtest --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID})"
     if openstack server show "${id}" >/dev/null 2>/dev/null; then
         break
     fi
     retries=$((retries - 1))
     if [ $retries -lt 0 ]; then
-        echo "failed 20 times, giving up: openstack server create -f shell --flavor m1.small --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID}" >&2
+        echo "failed 20 times, giving up: openstack server create -f shell --flavor autopkgtest --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID}" >&2
         exit 1
     fi
     echo "openstack server create failed, waiting ten seconds before retrying"