autopkgtest-cloud

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

  1. Git
  2. lp:autopkgtest-cloud
  3. cninr-autopkgtest
  4. Merge into master
Proposed by Brian Murray
Status: Merged
Approved by: Tim Andersson
Approved revision: 5cbde09570e0c7815dcd3a08b84ebe432ad7d1a5
Merged at revision: d5dfeade1dae3ac378f420fdf0e4d6e101ac59d5
Proposed branch: autopkgtest-cloud:cninr-autopkgtest
Merge into: autopkgtest-cloud:master
Diff against target: 20 lines (+2/-2)
1 file modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release (+2/-2)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+443513@code.launchpad.net

Description of the change

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!

To post a comment you must log in.
Revision history for this message
Tim Andersson (andersson123) wrote :

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?

Revision history for this message
Tim Andersson (andersson123) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --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
2index 444d919..bc51ff1 100755
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release
5@@ -73,13 +73,13 @@ NET_ID=${id}
6
7 retries=20
8 while true; do
9- eval "$(openstack server create -f shell --flavor m1.small --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID})"
10+ eval "$(openstack server create -f shell --flavor autopkgtest --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID})"
11 if openstack server show "${id}" >/dev/null 2>/dev/null; then
12 break
13 fi
14 retries=$((retries - 1))
15 if [ $retries -lt 0 ]; then
16- 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
17+ 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
18 exit 1
19 fi
20 echo "openstack server create failed, waiting ten seconds before retrying"

Subscribers

People subscribed via source and target branches