Merge pull request canonical#62 from simondeziel/genisoimage

tests/storage-volumes-vm: always install genisoimage
MusicDin · Feb 6, 2024 · 72bb3aa · 72bb3aa
2 parents ef9c571 + 5cb8f99
commit 72bb3aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/bin/openstack-run b/bin/openstack-run
@@ -54,6 +54,7 @@ create() {
     openstack server create --key-name "${KEY_NAME}" --flavor "${FLAVOR}" --network "${NETWORK}" --image "${IMAGE}" --user-data ./cloud-init.user-data.yaml --wait "${NAME}"
     IP="$(openstack server show -f value -c addresses "${NAME}" | cut -d\' -f4)"
     [ "${IP}" != "{}" ]
+    [ -n "${IP}" ]
     echo "${NAME}: ${IP}" >&2
 }
 

diff --git a/tests/storage-volumes-vm b/tests/storage-volumes-vm
@@ -2,9 +2,7 @@
 set -eux
 
 # Install dependencies
-if hasNeededAPIExtension custom_volume_iso; then
-  install_deps genisoimage
-fi
+install_deps genisoimage
 
 # Install LXD
 install_lxd