Skip to content
Snippets Groups Projects
Commit c301f8eb authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/t28526' into 'master'

tests: Fix CI builds when PRESSURE_VESSEL_DOWNLOAD_URL is unset

See merge request !52
parents 392878db 9e7b7bbe
No related branches found
No related tags found
1 merge request!52tests: Fix CI builds when PRESSURE_VESSEL_DOWNLOAD_URL is unset
Pipeline #14345 passed
...@@ -42,7 +42,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI ...@@ -42,7 +42,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
) )
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \ --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \ --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
......
...@@ -48,7 +48,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI ...@@ -48,7 +48,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
) )
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \ --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \ --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
......
...@@ -42,7 +42,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI ...@@ -42,7 +42,7 @@ if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTI
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
) )
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \ --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \ --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment