[Notes] [Git][BuildStream/buildstream][juerg/dummy-sandbox] 5 commits: sandbox/_sandboxremote.py: Use helpers to set up cwd and env

[Jürg Billeter <gitlab mg gitlab com>]

Title: GitLab

Jürg Billeter pushed to branch juerg/dummy-sandbox at BuildStream / buildstream

Commits:

• 5f4ae90b
  by Jürg Billeter at 2018-10-02T06:34:02Z

  sandbox/_sandboxremote.py: Use helpers to set up cwd and env
  
  This matches the other sandbox implementations.
  

• 0458bc4e
  by Jürg Billeter at 2018-10-02T07:08:35Z

  Merge branch 'juerg/sandbox' into 'master'
  
  sandbox/_sandboxremote.py: Use helpers to set up cwd and env
  
  See merge request BuildStream/buildstream!841

• d5b396e0
  by Phillip Smyth at 2018-10-02T16:40:18Z

  Forcing CI to install Sphinx 1.7.9
  
  .gitlab-ci.yml: forced pip3 install Sphinx 1.7.9
  The theme we use in our docs "sphinx_rtd_theme"
  Does not support the latest version of Sphinx (>1.8)
  This results in search functionality failing
  

• dae842fd
  by Phillip Smyth at 2018-10-02T17:14:09Z

  Merge branch 'docs_Search_not_working' into 'master'
  
  Fixing: Search functionality in the Documentation has stopped working
  
  Closes #681
  
  See merge request BuildStream/buildstream!848

• 8dc16d3f
  by Jürg Billeter at 2018-10-03T05:08:21Z

  _platform/linux.py: Accept all configs for dummy sandbox
  
  If Sandbox.run() is never called, sandbox config is irrelevant. If it is
  called, the build will fail anyway with the dummy sandbox.
  
  This matches the logic in the Darwin platform.
  

3 changed files:

• .gitlab-ci.yml
• buildstream/_platform/linux.py
• buildstream/sandbox/_sandboxremote.py

Changes:

.gitlab-ci.yml

---

...	...	@@ -145,7 +145,8 @@ docs:
145	145	stage: test
146	146	script:
147	147	- export BST_SOURCE_CACHE="$(pwd)/cache/integration-cache/sources"
148		- - pip3 install sphinx
	148	+ # Currently sphinx_rtd_theme does not support Sphinx >1.8, this breaks search functionality
	149	+ - pip3 install sphinx==1.7.9
149	150	- pip3 install sphinx-click
150	151	- pip3 install sphinx_rtd_theme
151	152	- cd dist && ./unpack.sh && cd buildstream

buildstream/_platform/linux.py

---

...	...	@@ -55,6 +55,10 @@ class Linux(Platform):
55	55	return SandboxBwrap(*args, **kwargs)
56	56
57	57	def check_sandbox_config(self, config):
	58	+ if not self._local_sandbox_available():
	59	+ # Accept all sandbox configs as it's irrelevant with the dummy sandbox (no Sandbox.run).
	60	+ return True
	61	+
58	62	if self._user_ns_available:
59	63	# User namespace support allows arbitrary build UID/GID settings.
60	64	return True

buildstream/sandbox/_sandboxremote.py

---

...	...	@@ -177,15 +177,11 @@ class SandboxRemote(Sandbox):
177	177	if not cascache.verify_digest_pushed(self._get_project(), upload_vdir.ref):
178	178	raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.")
179	179
180		- # Set up environment and working directory
181		- if cwd is None:
182		- cwd = self._get_work_directory()
183		-
184		- if cwd is None:
185		- cwd = '/'
186		-
187		- if env is None:
188		- env = self._get_environment()
	180	+ # Fallback to the sandbox default settings for
	181	+ # the cwd and env.
	182	+ #
	183	+ cwd = self._get_work_directory(cwd=cwd)
	184	+ env = self._get_environment(cwd=cwd, env=env)
189	185
190	186	# We want command args as a list of strings
191	187	if isinstance(command, str):

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