Merge ~ubuntu-release/autopkgtest/+git/development:arch-not-hwarch into ~ubuntu-release/autopkgtest/+git/development:master

[Brian Murray]

ssh-setup/nova was failing with the following error:

9s flock: failed to execute s390x.boot.lock: No such file or directory

After a long debugging session I discovered that ARCH was incorrect:

ubuntu@juju-4d1272-prod-proposed-migration-14:~$ openstack image show adt/ubuntu-mantic-s390x-server-20230907.img -c properties -f json | grep architecture | cut -d'"' -f4 s390x s390x

Removing the cut this is because:

ubuntu@juju-4d1272-prod-proposed-migration-14:~$ openstack image show adt/ubuntu-mantic-s390x-server-20230907.img -c properties
 -f json | grep architecture
    "hw_architecture": "s390x",
    "architecture": "s390x",

While we should move to jq, it is not currently installed on both autopkgtest-cloud-workers and when new units are provisioned they aren't set up to have it, by switching the grep to '"architecture"' we can at least fix this issue.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/ssh-setup/nova b/ssh-setup/nova
index aafa08b..e581ee5 100755
--- a/ssh-setup/nova
+++ b/ssh-setup/nova
@@ -231,7 +231,7 @@ EOF
     # utlization in the cloud does not get reported properly and instances
     # failed to boot.
     # ARCH=$(openstack image show $imageuuid -c properties -f json | jq --raw-output .properties.architecture)
-    ARCH=$(openstack image show $imageuuid -c properties -f json | grep architecture | cut -d'"' -f4)
+    ARCH=$(openstack image show $imageuuid -c properties -f json | grep '"architecture"' | cut -d'"' -f4)
     flock --verbose -x /home/ubuntu/$OS_REGION_NAME-$ARCH.boot.lock sleep 15
 
     # Boot a nova instance and returns its connection parameters