Commits on Source (24)
-
Simon McVittie authored
If the user was previously running a self-contained version of scout, toolmanifest.vdf will need to be reloaded before we will get run in a soldier container as required. Implement the entry point path used in the self-contained version as a script that just pops up a zenity error. (T28437) Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
scout-on-soldier: Fail if toolmanifest.vdf has not been reloaded See merge request !49
-
Simon McVittie authored
This prevents PRESSURE_VESSEL_SHELL=instead from interfering with setup commands, which might need to use stdout. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Ludovico de Nittis authored
_v2-entry-point: Run pressure-vessel noninteractively for setup commands See merge request !54
-
Simon McVittie authored
Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
If we're building a SteamLinuxRuntime_soldier depot and we want to test launching it from a LD_LIBRARY_PATH runtime (as Steam would), there is no point in trying to match the version number of scout to a version number of soldier. Worst case it'll just fail, and best case it'll use an arbitrary scout build that happens to have been done on the same day as the soldier build. This is particularly problematic right now because the latest build of soldier happens to be 0.20210618.0. scout build 0.20210618.0 existed, but had a broken steam-runtime.tar.xz, because the setup.sh script is not executable. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
If we're bundling our own LD_LIBRARY_PATH runtime, we should say which one it is. Conversely, if we're relying on the LD_LIBRARY_PATH runtime shipped with Steam, we should explicitly say that. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
With some changes coming in via pressure-vessel, some via the container image and some via the scripts, any or all of which might be updated in any given container build, it's getting a bit confusing. If we assign an overall version number to the whole container, we can talk about a particular depot build unambiguously. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
populate-depot: Use latest scout build for LD_LIBRARY_PATH runtime See merge request !57
-
Ludovico de Nittis authored
populate-depot: Store LD_LIBRARY_PATH version in layered scout runtime See merge request !58
-
Ludovico de Nittis authored
populate-depot: Have an overall version number for the depot as a whole See merge request !59
-
Simon McVittie authored
Recent builds of soldier have zenity installed. This lets us show the same progress dialog we would show normally, but from within the container. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
This means that ${here}/steam-runtime can safely be a symlink to a copy of scout in a read-only location. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
We can't use STEAM_RUNTIME for this because games use it as an indication that they are running inside the Steam Runtime, and because pressure-vessel-wrap removes it from the environment when leaving the "outer" scout environment behind. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
For the normal scout runtime this happens automatically, because the whole steam-runtime/ directory is deleted and replaced, but for the scout-on-soldier setup we need to manage this ourselves. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
Because scout and soldier are relatively fixed targets, and we know that soldier is strictly newer than scout, we don't need to go to all this effort to figure out which libraries are newer if they exist in both scout and soldier: the answer is always "the one in soldier". This means the only library we need to pin is the single library that is hard-coded to be pinned, namely libcurl.so.4, for which the ABI broke between scout and soldier. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
These are unlikely to be used in practice, but steam-runtime-tools considers absence of scripts/ to indicate a malformed LD_LIBRARY_PATH runtime. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
If the command fails, we probably want to see why before we fail the test. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
If s-r-s-i doesn't like our runtime, we'll want to know what it was thinking. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
It's easier to understand test failures if we can see the output in a comprehensible format. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
Debugging locally has a better cycle time than running the test in various increasingly-old virtual machines. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
When building a soldier runtime, check that layering scout onto it also works as intended. This test detected several bugs that are fixed in prior commits. Signed-off-by:
Simon McVittie <smcv@collabora.com>
-
Simon McVittie authored
populate-depot: Fix and test layered runtime See merge request !55
Showing
- common/_v2-entry-point 4 additions, 0 deletionscommon/_v2-entry-point
- populate-depot.py 34 additions, 16 deletionspopulate-depot.py
- runtimes/scout-on-soldier/_v2-entry-point 20 additions, 0 deletionsruntimes/scout-on-soldier/_v2-entry-point
- runtimes/scout-on-soldier/scout-on-soldier-entry-point-v2 233 additions, 0 deletionsruntimes/scout-on-soldier/scout-on-soldier-entry-point-v2
- runtimes/scout-on-soldier/toolmanifest.vdf 1 addition, 1 deletionruntimes/scout-on-soldier/toolmanifest.vdf
- tests/depot/pressure-vessel.py 151 additions, 29 deletionstests/depot/pressure-vessel.py
- tests/scout.sh 14 additions, 4 deletionstests/scout.sh
- tests/soldier.sh 6 additions, 0 deletionstests/soldier.sh
runtimes/scout-on-soldier/_v2-entry-point
0 → 100755