diff options
| author | Jürg Billeter <j@bitron.ch> | 2018-03-15 10:43:07 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2018-07-17 07:56:40 +0200 |
| commit | 8de8ef1f4b71c6b0d72d5e171b8abfedb2650d0b (patch) | |
| tree | cb96ee0817667b9f13437172dda837829432e1d6 | |
| parent | 9b8790153a2d5cc81e5b27cec92313d5a377bfa7 (diff) | |
| download | buildstream-8de8ef1f4b71c6b0d72d5e171b8abfedb2650d0b.tar.gz | |
_platform: Use CAS artifact cache
| -rw-r--r-- | buildstream/_platform/linux.py | 4 | ||||
| -rw-r--r-- | buildstream/_platform/unix.py | 4 | ||||
| -rw-r--r-- | tests/testutils/runcli.py | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/buildstream/_platform/linux.py b/buildstream/_platform/linux.py index fec512b0a..56ebb410e 100644 --- a/buildstream/_platform/linux.py +++ b/buildstream/_platform/linux.py @@ -21,7 +21,7 @@ import subprocess from .. import _site from .. import utils -from .._artifactcache.ostreecache import OSTreeCache +from .._artifactcache.cascache import CASCache from .._message import Message, MessageType from ..sandbox import SandboxBwrap @@ -36,7 +36,7 @@ class Linux(Platform): self._die_with_parent_available = _site.check_bwrap_version(0, 1, 8) self._user_ns_available = self._check_user_ns_available(context) - self._artifact_cache = OSTreeCache(context, enable_push=self._user_ns_available) + self._artifact_cache = CASCache(context, enable_push=self._user_ns_available) @property def artifactcache(self): diff --git a/buildstream/_platform/unix.py b/buildstream/_platform/unix.py index 8b1d2ece7..be4c129d3 100644 --- a/buildstream/_platform/unix.py +++ b/buildstream/_platform/unix.py @@ -19,7 +19,7 @@ import os -from .._artifactcache.tarcache import TarCache +from .._artifactcache.cascache import CASCache from .._exceptions import PlatformError from ..sandbox import SandboxChroot @@ -31,7 +31,7 @@ class Unix(Platform): def __init__(self, context, project): super().__init__(context, project) - self._artifact_cache = TarCache(context) + self._artifact_cache = CASCache(context) # Not necessarily 100% reliable, but we want to fail early. if os.geteuid() != 0: diff --git a/tests/testutils/runcli.py b/tests/testutils/runcli.py index 658e38874..96d4ea457 100644 --- a/tests/testutils/runcli.py +++ b/tests/testutils/runcli.py @@ -19,8 +19,6 @@ import pytest # from _pytest.capture import MultiCapture, FDCapture -from tests.testutils.site import IS_LINUX - # Import the main cli entrypoint from buildstream._frontend import cli as bst_cli from buildstream import _yaml @@ -203,10 +201,7 @@ class Cli(): def remove_artifact_from_cache(self, project, element_name): cache_dir = os.path.join(project, 'cache', 'artifacts') - if IS_LINUX: - cache_dir = os.path.join(cache_dir, 'ostree', 'refs', 'heads') - else: - cache_dir = os.path.join(cache_dir, 'tar') + cache_dir = os.path.join(cache_dir, 'cas', 'refs', 'heads') cache_dir = os.path.splitext(os.path.join(cache_dir, 'test', element_name))[0] shutil.rmtree(cache_dir) |