[Notes] [Git][BuildStream/buildstream][master] 3 commits: _artifactcache.py: don't leak the project specific remote caches

[Javier Jardón <gitlab mg gitlab com>]

Title: GitLab

Javier Jardón pushed to branch master at BuildStream / buildstream

Commits:

• 1ee4a4ba
  by Abderrahim Kitouni at 2019-02-08T16:42:23Z

  _artifactcache.py: don't leak the project specific remote caches
  
  the code for initializing remotes added the project specific remote
  caches to the global list instead of making a copy.
  
  Fixes #618
  

• 24c0de16
  by Abderrahim Kitouni at 2019-02-08T16:42:23Z

  _project.py: use artifact caches from the parent project for junctions
  
  This makes a junction use the artifact cache of the parent project
  before the ones defined for the junction
  
  Fixes #401
  

• a937f99a
  by Javier Jardón at 2019-02-08T20:29:05Z

  Merge branch 'abderrahim/artifact-cache-junction' into 'master'
  
  Use artifact cache specs from the parent project before those defined in junctions
  
  Closes #618 and #401
  
  See merge request BuildStream/buildstream!1113

2 changed files:

• buildstream/_artifactcache.py
• buildstream/_project.py

Changes:

buildstream/_artifactcache.py

---

...	...	@@ -467,7 +467,7 @@ class ArtifactCache():
467	467	# on_failure (callable): Called if we fail to contact one of the caches.
468	468	#
469	469	def initialize_remotes(self, *, on_failure=None):
470		- remote_specs = self.global_remote_specs
	470	+ remote_specs = list(self.global_remote_specs)
471	471
472	472	for project in self.project_remote_specs:
473	473	remote_specs += self.project_remote_specs[project]
...	...	@@ -1046,8 +1046,5 @@ class ArtifactCache():
1046	1046	# A list of ArtifactCacheSpec instances describing the remote artifact caches.
1047	1047	#
1048	1048	def _configured_remote_artifact_cache_specs(context, project):
1049		- project_overrides = context.get_overrides(project.name)
1050		- project_extra_specs = ArtifactCache.specs_from_config_node(project_overrides)
1051		-
1052	1049	return list(utils._deduplicate(
1053		- project_extra_specs + project.artifact_cache_specs + context.artifact_cache_specs))
	1050	+ project.artifact_cache_specs + context.artifact_cache_specs))

buildstream/_project.py

---

...	...	@@ -549,7 +549,15 @@ class Project():
549	549	#
550	550
551	551	# Load artifacts pull/push configuration for this project
552		- self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config, self.directory)
	552	+ project_specs = ArtifactCache.specs_from_config_node(config, self.directory)
	553	+ override_specs = ArtifactCache.specs_from_config_node(
	554	+ self._context.get_overrides(self.name), self.directory)
	555	+
	556	+ self.artifact_cache_specs = override_specs + project_specs
	557	+
	558	+ if self.junction:
	559	+ parent = self.junction._get_project()
	560	+ self.artifact_cache_specs = parent.artifact_cache_specs + self.artifact_cache_specs
553	561
554	562	# Load remote-execution configuration for this project
555	563	project_specs = SandboxRemote.specs_from_config_node(config, self.directory)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.