Remove soledad server from keymanager builder

1 files changed, 6 insertions, 5 deletions

diff --git a/master.cfg b/master.cfg
index 3d166aa..3e606b5 100644
--- a/master.cfg
+++ b/master.cfg
@@ -109,11 +109,12 @@ def add_repo_to_factory(factory, repo_name, git_branch, namespace, venv_name):
         factory.addStep(ShellCommand(command='pkg/postmkvenv.sh',env=sandbox_path,haltOnFailure=False, workdir=workdir, name="postmkenv"))
     if 'soledad.git' in repo_url:
         for subpackage in ["common", "client", "server"]:
-            factory.addSteps([
-                ShellCommand(command=install_requirements, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="reqs: " + repo_name+"."+subpackage),
-                ShellCommand(command=install_requirements_tests, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="test reqs: " + repo_name+"."+subpackage),
-                ShellCommand(command=install, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="Install " + repo_name+"."+subpackage)
-            ])
+            if 'keymanager' in venv_name and subpackage is not "server": # keymanager doesn't need soledad.server
+                factory.addSteps([
+                    ShellCommand(command=install_requirements, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="reqs: " + repo_name+"."+subpackage),
+                    ShellCommand(command=install_requirements_tests, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="test reqs: " + repo_name+"."+subpackage),
+                    ShellCommand(command=install, env=sandbox_path_soledad, haltOnFailure=True, workdir=workdir+'/'+subpackage, name="Install " + repo_name+"."+subpackage)
+                ])
     else:
         factory.addSteps([
             ShellCommand(command=install_requirements, env=sandbox_path, haltOnFailure=False, workdir=workdir, name="reqs: " + repo_name),