zuul
/
zuul
Code Issues Proposed changes

Use ZUUL_TEST_ROOT in launcher 

With this, the ansible launch server will automatically honor the
test root when it creates its tempdirs.

Change-Id: I4794c59cf7db63a992415a8933259bd0a2e4af54
This commit is contained in:
James E. Blair 2017-02-02 11:25:39 -08:00
parent e47eb770dd
commit 854f889681
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/base.py
View File

@ -1273,6 +1273,7 @@ class ZuulTestCase(BaseTestCase):
self.launch_server = RecordingLaunchServer(
self.config, self.connections,
jobdir_root=self.test_root,
_run_ansible=self.run_ansible,
_test_root=self.test_root)
self.launch_server.start()

10
zuul/launcher/server.py
View File

@ -74,9 +74,9 @@ class JobDirPlaybook(object):
class JobDir(object):
def __init__(self, keep=False):
def __init__(self, root=None, keep=False):
self.keep = keep
self.root = tempfile.mkdtemp()
self.root = tempfile.mkdtemp(dir=root)
self.git_root = os.path.join(self.root, 'git')
os.makedirs(self.git_root)
self.ansible_root = os.path.join(self.root, 'ansible')
@ -179,9 +179,11 @@ class DeduplicateQueue(object):
class LaunchServer(object):
log = logging.getLogger("zuul.LaunchServer")
def __init__(self, config, connections={}, keep_jobdir=False):
def __init__(self, config, connections={}, jobdir_root=None,
keep_jobdir=False):
self.config = config
self.keep_jobdir = keep_jobdir
self.jobdir_root = jobdir_root
# TODOv3(mordred): make the launcher name more unique --
# perhaps hostname+pid.
self.hostname = socket.gethostname()
@ -444,7 +446,7 @@ class AnsibleJob(object):
def launch(self):
try:
self.jobdir = JobDir()
self.jobdir = JobDir(root=self.launcher_server.jobdir_root)
self._launch()
except Exception:
self.log.exception("Exception while launching job")