Skip to content
Snippets Groups Projects

tests: Use more default settings

Merged Simon McVittie requested to merge wip/more-defaults into master
3 files
+ 18
39
Compare changes
  • Side-by-side
  • Inline
Files
3
  • da8a20f2
    tests: Use more default settings · da8a20f2
    Simon McVittie authored
    The download URL defaults to the public download URL and the version of
    pressure-vessel defaults to the latest standalone release, so we don't
    usually need to specify those two explicitly.
    
    In the case of PRESSURE_VESSEL_DOWNLOAD_URL, if it has been explicitly
    set, we still want to pass it in: the official CI does this to bypass
    the CDN that implements repo.steampowered.com and go directly to the
    origin server.
    
    Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
+ 6
13
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
)
)
fi
fi
if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
fi
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
populate_depot_args=( \
populate_depot_args=( \
"${populate_depot_args[@]}" \
"${populate_depot_args[@]}" \
@@ -41,21 +37,18 @@ else
@@ -41,21 +37,18 @@ else
)
)
fi
fi
if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=()
pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
--pressure-vessel-version=latest \
)
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \
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}" \
--pressure-vessel-version=latest \
)
)
else
elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
pressure_vessel_args=( \
pressure_vessel_args=( \
 
"${pressure_vessel_args[@]}" \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
)
fi
fi
Loading