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

tests: Don't rely on being able to put more than one suite in a depot


The SteamLinuxRuntime scripts have phased out support for populating a
depot directory with a mixture of scout and soldier, because that
doesn't really make sense for a game or a compat tool: each native Linux
game, and each compat tool used to run non-native games, expects to run
in one particular environment (scout or soldier or something else) and
using any other environment would be incorrect.

However, tests/pressure-vessel/containers.py currently expects to work
with a directory that contains both scout and soldier. For now, we'll
download scout and soldier separately, then mash them together into the
same directory.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 240203c8
No related branches found
No related tags found
1 merge request!322Update populate-depot.py
......@@ -321,36 +321,6 @@ relocatable-install:production:
- _build/production/pressure-vessel-bin+src.tar.gz
when: on_success
.prepare_test: &prepare_test
- |
set -eux
PRESSURE_VESSEL=_build/production/pressure-vessel-bin.tar.gz
mkdir -p _build/depot-template/common
if [ -n "${IMAGES_DOWNLOAD_URL}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL}" ]; then
python3 ./pressure-vessel/populate-depot.py \
--depot=_build/depot \
--source-dir=_build/depot-template \
--include-sdk \
--unpack-runtimes \
--credential-env IMAGES_DOWNLOAD_CREDENTIAL \
--images-uri "${IMAGES_DOWNLOAD_URL}"/steamrt-SUITE/snapshots \
--pressure-vessel "${PRESSURE_VESSEL}" \
scout \
soldier \
${NULL+}
else
python3 ./pressure-vessel/populate-depot.py \
--depot=_build/depot \
--source-dir=_build/depot-template \
--unpack-runtimes \
--pressure-vessel "${PRESSURE_VESSEL}" \
--version latest-steam-client-public-beta \
scout \
${NULL+}
fi
.i386_dependencies: &i386_dependencies
- |
set -eux
......@@ -384,7 +354,7 @@ test:debian-10:
extends: .test_template
image: debian:buster-slim
script:
- *prepare_test
- ./tests/pressure-vessel/prepare-test-depots.sh
- *i386_dependencies
- |
set -eux
......@@ -397,7 +367,7 @@ test:ubuntu-18.04:
extends: .test_template
image: ubuntu:18.04
script:
- *prepare_test
- ./tests/pressure-vessel/prepare-test-depots.sh
- *i386_dependencies
- |
set -eux
......@@ -410,7 +380,7 @@ test:ubuntu-20.04:
extends: .test_template
image: ubuntu:20.04
script:
- *prepare_test
- ./tests/pressure-vessel/prepare-test-depots.sh
- *i386_dependencies
- |
set -eux
......@@ -448,7 +418,7 @@ test:archlinux:
export PYTHONPATH="$tempdir/python-debian/lib"
script:
- *prepare_test
- ./tests/pressure-vessel/prepare-test-depots.sh
- |
set -eux
......
#!/bin/sh
set -eux
builddir="${1:-_build}"
PRESSURE_VESSEL="${2:-_build/production/pressure-vessel-bin.tar.gz}"
rm -fr "$builddir/depot"
rm -fr "$builddir/depot-template"
mkdir -p "$builddir/depot"
mkdir -p "$builddir/depot-template/common"
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
suites="scout soldier"
set -- \
--include-sdk \
--credential-env IMAGES_DOWNLOAD_CREDENTIAL \
--images-uri "${IMAGES_DOWNLOAD_URL}"/steamrt-SUITE/snapshots \
${NULL+}
else
suites="scout"
set -- \
--version latest-steam-client-public-beta \
${NULL+}
fi
for suite in $suites; do
python3 ./pressure-vessel/populate-depot.py \
--depot="$builddir/depots/$suite" \
--pressure-vessel "${PRESSURE_VESSEL}" \
--source-dir="$builddir/depot-template" \
--unpack-runtimes \
"$@" \
"${suite}"
for member in "$builddir/depots/$suite"/*; do
rm -fr "$builddir/depot/${member##*/}"
done
mv "$builddir/depots/$suite"/* "$builddir/depot/"
done
# vim:set sw=4 sts=4 et:
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