From ed8484a78f6a7d2fe9d1cea76c38ca900f7ef40b Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 15 Jun 2021 17:00:43 +0100 Subject: [PATCH] tests: Always download both scout and soldier Now that we're invoking populate-depot.py once per runtime branch, it's straightforward to use different versions for different runtimes. Signed-off-by: Simon McVittie <smcv@collabora.com> --- tests/pressure-vessel/prepare-test-depots.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/pressure-vessel/prepare-test-depots.sh b/tests/pressure-vessel/prepare-test-depots.sh index 189c23139..cddb27128 100755 --- a/tests/pressure-vessel/prepare-test-depots.sh +++ b/tests/pressure-vessel/prepare-test-depots.sh @@ -18,13 +18,18 @@ if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; --images-uri "${IMAGES_DOWNLOAD_URL}"/steamrt-SUITE/snapshots \ ${NULL+} else - suites="scout" - set -- \ - --version latest-steam-client-public-beta \ - ${NULL+} + suites="scout=latest-steam-client-public-beta soldier=latest-container-runtime-public-beta" + set -- # no extra arguments fi for suite in $suites; do + case "$suite" in + (*=*) + set -- "$@" --version "${suite#*=}" + suite="${suite%%=*}" + ;; + esac + time python3 ./pressure-vessel/populate-depot.py \ --depot="$builddir/depots/$suite" \ --include-archives \ -- GitLab