mpi: substitute $TESTDIR

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/mpi.py b/teuthology/task/mpi.py
index b6e760c4d94d6f9a85464ab6e4da5d50d0031dd8..773ab7645ad206ca9242ac1c941384c7adc84a87 100644 (file)
--- a/teuthology/task/mpi.py
+++ b/teuthology/task/mpi.py
@@ -55,7 +55,10 @@ def task(ctx, config):
     """
     assert isinstance(config, dict), 'task mpi got invalid config'
     assert 'exec' in config, 'task mpi got invalid config, missing exec'
-    mpiexec = config['exec']
+
+    testdir = teuthology.get_testdir(ctx)
+
+    mpiexec = config['exec'].replace('$TESTDIR', testdir)
     hosts = []
     remotes = []
     master_remote = None
@@ -85,12 +88,10 @@ def task(ctx, config):
 
     workdir = []
     if 'workdir' in config:
-        workdir = ['-wdir', config['workdir'] ]
+        workdir = ['-wdir', config['workdir'].replace('$TESTDIR', testdir) ]
 
     log.info('mpi rank 0 is: {name}'.format(name=master_remote.name))
 
-    testdir = teuthology.get_testdir(ctx)
-
     # write out the mpi hosts file
     log.info('mpi nodes: [%s]' % (', '.join(hosts)))
     teuthology.write_file(remote=master_remote,