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

Merge branch 'wip/fix-public-beta-alias' into 'master'

tests: Update for infrastructure changes

See merge request !61
parents a3890363 53870080
No related branches found
No related tags found
1 merge request!61tests: Update for infrastructure changes
Pipeline #15132 passed with warnings
...@@ -19,6 +19,10 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then ...@@ -19,6 +19,10 @@ 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[@]}" \
...@@ -33,11 +37,11 @@ elif [ -n "${IMAGES_SSH_HOST-}" ] && [ -n "${IMAGES_SSH_PATH-}" ]; then ...@@ -33,11 +37,11 @@ elif [ -n "${IMAGES_SSH_HOST-}" ] && [ -n "${IMAGES_SSH_PATH-}" ]; then
else else
populate_depot_args=( \ populate_depot_args=( \
"${populate_depot_args[@]}" \ "${populate_depot_args[@]}" \
--version latest-container-runtime-public-beta \ --version latest-steam-client-public-beta \
) )
fi fi
if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
...@@ -50,7 +54,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS ...@@ -50,7 +54,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS
) )
else else
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-from-runtime-json='{"version": "latest-container-runtime-public-beta"}' \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
) )
fi fi
......
...@@ -19,6 +19,10 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then ...@@ -19,6 +19,10 @@ 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[@]}" \
...@@ -43,7 +47,7 @@ else ...@@ -43,7 +47,7 @@ else
) )
fi fi
if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
...@@ -56,7 +60,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS ...@@ -56,7 +60,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS
) )
else else
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-from-runtime-json='{"version": "latest-container-runtime-public-beta"}' \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
) )
fi fi
......
...@@ -19,6 +19,10 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then ...@@ -19,6 +19,10 @@ 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[@]}" \
...@@ -37,7 +41,7 @@ else ...@@ -37,7 +41,7 @@ else
) )
fi fi
if [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \ --pressure-vessel-version=latest \
...@@ -50,7 +54,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS ...@@ -50,7 +54,8 @@ elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESS
) )
else else
pressure_vessel_args=( \ pressure_vessel_args=( \
--pressure-vessel-from-runtime-json='{"version": "latest-container-runtime-public-beta"}' \ --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
) )
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment