[Notes] [Git][BuildStream/buildstream][jmac/rename_instance_name] 3 commits: buildstream/plugins/elements/script.py: Mark script as BST_VIRTUAL_DIRECTORY

[Jim MacArthur <gitlab mg gitlab com>]

Title: GitLab

Jim MacArthur pushed to branch jmac/rename_instance_name at BuildStream / buildstream

Commits:

• eb0dbcfc
  by Valentin David at 2019-01-09T13:56:58Z

  buildstream/plugins/elements/script.py: Mark script as BST_VIRTUAL_DIRECTORY
  
  ScriptElement does not use Sandbox.get_directory. It works using it
  with remote execution.
  
  Fixes #850
  

• f7681925
  by Valentin David at 2019-01-09T14:44:22Z

  Merge branch 'valentindavid/script_virtual_directory' into 'master'
  
  buildstream/plugins/elements/script.py: Mark script as BST_VIRTUAL_DIRECTORY
  
  Closes #850
  
  See merge request BuildStream/buildstream!1047

• f87d1c93
  by Jim MacArthur at 2019-01-09T15:01:18Z

  sandboxremote.py: Rename 'instance_name' option to 'instance-name'
  
  It was 'instance-name' in the documentation.
  

2 changed files:

• buildstream/_artifactcache/cascache.py
• buildstream/plugins/elements/script.py

Changes:

buildstream/_artifactcache/cascache.py

---

...	...	@@ -53,7 +53,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key
53	53	#
54	54	@staticmethod
55	55	def _new_from_config_node(spec_node, basedir=None):
56		- _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance_name'])
	56	+ _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance-name'])
57	57	url = _yaml.node_get(spec_node, str, 'url')
58	58	push = _yaml.node_get(spec_node, bool, 'push', default_value=False)
59	59	if not url:
...	...	@@ -61,7 +61,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key
61	61	raise LoadError(LoadErrorReason.INVALID_DATA,
62	62	"{}: empty artifact cache URL".format(provenance))
63	63
64		- instance_name = _yaml.node_get(spec_node, str, 'instance_name', default_value=None)
	64	+ instance_name = _yaml.node_get(spec_node, str, 'instance-name', default_value=None)
65	65
66	66	server_cert = _yaml.node_get(spec_node, str, 'server-cert', default_value=None)
67	67	if server_cert and basedir:

buildstream/plugins/elements/script.py

---

...	...	@@ -42,6 +42,9 @@ import buildstream
42	42	class ScriptElement(buildstream.ScriptElement):
43	43	# pylint: disable=attribute-defined-outside-init
44	44
	45	+ # This plugin has been modified to avoid the use of Sandbox.get_directory
	46	+ BST_VIRTUAL_DIRECTORY = True
	47	+
45	48	def configure(self, node):
46	49	for n in self.node_get_member(node, list, 'layout', []):
47	50	dst = self.node_subst_member(n, 'destination')

—
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.