diff options
author | Parménides GV <parmegv@sdf.org> | 2015-08-05 12:04:45 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-08-05 12:04:45 +0200 |
commit | faf9d89fd7e2f481a564390249bdf5dfb2994279 (patch) | |
tree | 1256fecf940c42e47caa256edd420525b1b99d1e | |
parent | 350238bf0f858c8a51c42db26b6dc2e668356b1e (diff) | |
parent | a4aedfbb4c9989d543beadba119719e74c272c03 (diff) |
Merge branch 'bug/missing_files_in_generated_bundles'
-rw-r--r-- | master.cfg | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -110,10 +110,13 @@ def add_repo_to_factory(factory, repo_name, git_branch, namespace, venv_name): Git(repourl=repo_url, branch=git_branch, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url)) if 'bitmask_client' in repo_name: - factory.addStep(ShellCommand(command='pkg/postmkvenv.sh',env=sandbox_path,haltOnFailure=False, workdir=workdir, name="postmkenv")) + factory.addSteps([ + ShellCommand(command='pkg/postmkvenv.sh',env=sandbox_path,haltOnFailure=False, workdir=workdir, name="postmkenv"), + ShellCommand(command='make',env=sandbox_path,haltOnFailure=False, workdir=workdir, name="make") + ]) if 'soledad.git' in repo_url: for subpackage in ["common", "client", "server"]: - if 'keymanager' in venv_name and subpackage is not "server": # keymanager doesn't need soledad.server + if 'keymanager' in venv_name and subpackage is not "server" or 'keymanager' is not venv_name: # 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), @@ -149,10 +152,11 @@ def create_builder(repo_name): if namespace is not '': factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir=repo_name, name="trial "+namespace)) - if repo_name is 'bitmask_client': + if repo_name == 'bitmask_client': publish_sumo = publish_sumo_command('`ls -t *SUMO.tar.gz | head -1`') - factory.addSteps( - [ShellCommand(command=['make', 'sumo_tarball'], + + factory.addSteps([ + ShellCommand(command=['make', 'sumo_tarball'], env=venv_path_factory, workdir=repo_name, doStepIf=(lambda step: step.getProperty('slavename') == localhost_slave), name="make sumo tarball"), @@ -168,7 +172,7 @@ def create_builder(repo_name): def publish_sumo_command(location): directory = config.get('ftp', 'sumo_target_directory') command = ftp_publish_command(location, directory) + ' && ' + ftp_soft_link(location, directory, 'leap.bitmask-latest-SUMO.tar.gz') - + return command def ftp_soft_link(filename, target_directory, symlink_name): |