_project.py: use artifact caches from the parent project for junctionsabderrahim/artifact-cache-junction

This makes a junction use the artifact cache of the parent project
before the ones defined for the junction

Fixes #401

1 files changed, 9 insertions, 1 deletions

diff --git a/buildstream/_project.py b/buildstream/_project.py
index 3ec141d58..5f4389edb 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -549,7 +549,15 @@ class Project():
         #
 
         # Load artifacts pull/push configuration for this project
-        self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config, self.directory)
+        project_specs = ArtifactCache.specs_from_config_node(config, self.directory)
+        override_specs = ArtifactCache.specs_from_config_node(
+            self._context.get_overrides(self.name), self.directory)
+
+        self.artifact_cache_specs = override_specs + project_specs
+
+        if self.junction:
+            parent = self.junction._get_project()
+            self.artifact_cache_specs = parent.artifact_cache_specs + self.artifact_cache_specs
 
         # Load remote-execution configuration for this project
         project_specs = SandboxRemote.specs_from_config_node(config, self.directory)