diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2018-02-26 12:46:13 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-02-28 09:17:45 +0000 |
| commit | 5ebb78240e674afb4ae86ecf41f9ca03192a6dba (patch) | |
| tree | 15991e45e0924898bbada67faeceaba46bd56b8d | |
| parent | ad0369fd1b1255407418d5789e83503f52fcd49b (diff) | |
| download | buildstream-5ebb78240e674afb4ae86ecf41f9ca03192a6dba.tar.gz | |
Modify how the INTEGRATION_CACHE environment var is interpreted
When specifying a location for the integration tests cache directory,
we would previously append '/integration-cache' to whatever path we
were given. This is regarded as confusing.
See: https://gitlab.com/BuildStream/buildstream/issues/267
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | conftest.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8949cba92..829bcd4fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ linux-tests: PYTEST_ADDOPTS: "--color=yes" script: - - export INTEGRATION_CACHE="$(pwd)/cache/" + - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache" # Unpack and get into dist/buildstream - cd dist && ./unpack.sh @@ -98,7 +98,7 @@ unix-tests: PYTEST_ADDOPTS: "--color=yes" script: - - export INTEGRATION_CACHE="$(pwd)/cache/" + - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache" # We remove the Bubblewrap and OSTree packages here so that we catch any # codepaths that try to use them. Removing OSTree causes fuse-libs to diff --git a/conftest.py b/conftest.py index ad42b70eb..ffe8fb3ae 100755 --- a/conftest.py +++ b/conftest.py @@ -40,7 +40,7 @@ def integration_cache(request): # Set the tempdir to the INTEGRATION_CACHE variable, or the # default if that is not set. if 'INTEGRATION_CACHE' in os.environ: - cache_dir = os.path.join(os.environ['INTEGRATION_CACHE'], 'integration-cache') + cache_dir = os.environ['INTEGRATION_CACHE'] else: cache_dir = os.path.abspath('./integration-cache') |