Workdir is repo_name, for sumo_tarball

1 files changed, 5 insertions, 5 deletions

diff --git a/master.cfg b/master.cfg
index 0c4a876..c53c37d 100644
--- a/master.cfg
+++ b/master.cfg
@@ -97,7 +97,7 @@ def add_repo_to_factory(factory, repo_name, git_branch, namespace, venv_name):
     install_requirements_tests = "if [ -f pkg/requirements-testing.pip ]; then pkg/pip_install_requirements.sh --testing; fi"
     install = "python setup.py develop"
 
-    workdir = "workdir-" + repo_name
+    workdir = repo_name
     sandbox_path = {'PATH':  "../" + venv_name + '/bin/' + ':${PATH}'}
     sandbox_path_soledad = {'PATH':  "../../" + venv_name + '/bin/' + ':${PATH}'}
     repo_url = github_repo_url(repo_name)
@@ -139,14 +139,14 @@ def create_builder(repo_name):
         add_repo_to_factory(factory, repo_name, repo_branch, namespace, venv_name)
 
     factory.addStep(
-        ShellCommand(command=['pep8', '--exclude=setup.py,versioneer.py,src._version', '--ignore=E501', '.'],env=venv_path_factory,haltOnFailure=False, workdir="workdir-" + repo_name, name="pep8 on " + repo_name))
+        ShellCommand(command=['pep8', '--exclude=setup.py,versioneer.py,src._version', '--ignore=E501', '.'],env=venv_path_factory,haltOnFailure=False, workdir=repo_name, name="pep8 on " + repo_name))
 
     if namespace is not '':
-        factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir="workdir-" + repo_name, name="trial "+namespace))
+        factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir=repo_name, name="trial "+namespace))
 
     if repo_name is 'bitmask_client':
         factory.addStep(ShellCommand(command=['make', 'sumo_tarball'],
-                                     env=venv_path_factory, workdir="workdir-" + repo_name,
+                                     env=venv_path_factory, workdir=repo_name,
                                      doStepIf=(lambda step: step.getProperty('slavename') == localhost_slave),
                                      name="make sumo tarball"))
 
@@ -169,7 +169,7 @@ def make_wheel_builder():
     factory.addStep(ShellCommand(command=['pip', 'install', '-U', 'wheel'], env=sandbox_path_top, haltOnFailure=True, workdir=".", name="Install wheels"))
     for repo_name, git_branch, _, _ in REPOS:
         repo_url = github_repo_url(repo_name)
-        workdir = "workdir-"+repo_name
+        workdir = repo_name
         factory.addStep(
             Git(repourl=repo_url, branch=git_branch, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url))
         if 'soledad' in repo_name: