.gitlab-ci.yml

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

buildstream/_platform/linux.py

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

buildstream/sandbox/_sandboxremote.py

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