Merge pull request #192 from ceph/mergify/bp/pacific/pr-190

validate: check for empty url (ceph_origin=custom) (backport #190)
ceph · Feb 8, 2023 · 8d3ceb8 · 8d3ceb8
2 parents c038e46 + 3924cfd
commit 8d3ceb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tests/scripts/vagrant_up.sh b/tests/scripts/vagrant_up.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 if [[ "${CEPH_ANSIBLE_VAGRANT_BOX}" =~ "centos/stream" ]]; then
   EL_VERSION="${CEPH_ANSIBLE_VAGRANT_BOX: -1}"
   LATEST_IMAGE="$(curl -s https://cloud.centos.org/centos/${EL_VERSION}-stream/x86_64/images/CHECKSUM | sed -nE 's/^SHA256.*\((.*-([0-9]+).*vagrant-libvirt.box)\).*$/\1/p' | sort -u | tail -n1)"

diff --git a/validate/preflight.yml b/validate/preflight.yml
@@ -19,7 +19,7 @@
         msg: "You must define 'ceph_custom_repositories' or 'custom_repo_url' when ceph_origin is 'custom'"
       when:
         - ceph_origin == 'custom'
-        - custom_repo_url is undefined
+        - (custom_repo_url is undefined or custom_repo_url == '')
         - ceph_custom_repositories is undefined
 
     - name: fail if baseurl is not defined for ceph_custom_repositories