From da8a20f2bbe2c741dafbfeca59fbb0c89e644138 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 5 Jul 2021 14:41:56 +0100
Subject: [PATCH] tests: Use more default settings

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: Simon McVittie <smcv@collabora.com>
---
 tests/scout.sh   | 19 ++++++-------------
 tests/sniper.sh  | 19 ++++++-------------
 tests/soldier.sh | 19 ++++++-------------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/tests/scout.sh b/tests/scout.sh
index ebe77cb..57dbafc 100755
--- a/tests/scout.sh
+++ b/tests/scout.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 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
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -41,21 +37,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -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-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-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi
 
diff --git a/tests/sniper.sh b/tests/sniper.sh
index 9d6cf22..7e27d91 100755
--- a/tests/sniper.sh
+++ b/tests/sniper.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 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
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -47,21 +43,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -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-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-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi
 
diff --git a/tests/soldier.sh b/tests/soldier.sh
index c37398b..7e6a25c 100755
--- a/tests/soldier.sh
+++ b/tests/soldier.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 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
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -41,21 +37,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -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-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-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi
 
-- 
GitLab