summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2019-06-22 18:36:21 -0400
committerPaul Belanger <pabelanger@redhat.com>2019-06-22 18:36:21 -0400
commit927857082b2ce22a030710e7dd783bed28c118fb (patch)
tree52842829ee9047d76247b4a62cc141f53587b6f8
parent2029ac77ba60eddd9d19f869363f9f3a993c04ad (diff)
downloadzuul-927857082b2ce22a030710e7dd783bed28c118fb.tar.gz
Stop bind mounting zuul dir into bwrap
Once we landed the multi-ansible spec, we no longer need to include the zuul directory where zuul-executor is run from. This is because we now install ansible into its own virtualenv. Change-Id: I35c66d7249841e32478b26b60d6e840fe3f2750d Signed-off-by: Paul Belanger <pabelanger@redhat.com>
-rw-r--r--zuul/driver/bubblewrap/__init__.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/zuul/driver/bubblewrap/__init__.py b/zuul/driver/bubblewrap/__init__.py
index a11c0e7ad..557bccb6d 100644
--- a/zuul/driver/bubblewrap/__init__.py
+++ b/zuul/driver/bubblewrap/__init__.py
@@ -95,18 +95,7 @@ class BubblewrapExecutionContext(BaseExecutionContext):
def getPopen(self, **kwargs):
self.setpag()
- # Set zuul_dir if it was not passed in
- if 'zuul_dir' in kwargs:
- zuul_dir = kwargs['zuul_dir']
- else:
- zuul_python_dir = os.path.dirname(sys.executable)
- # We want the dir directly above bin to get the whole venv
- zuul_dir = os.path.normpath(os.path.join(zuul_python_dir, '..'))
-
bwrap_command = list(self.bwrap_command)
- if not zuul_dir.startswith('/usr'):
- bwrap_command.extend(['--ro-bind', zuul_dir, zuul_dir])
-
for mount_type in ('ro', 'rw'):
bind_arg = '--ro-bind' if mount_type == 'ro' else '--bind'
for bind in self.mounts_map[mount_type]: