1
0
mirror of https://github.com/IEEE-SB-Passau/pelican-deployment-system.git synced 2017-09-06 16:35:38 +02:00

add path template for result.json

This commit is contained in:
2016-06-16 23:21:05 +02:00
parent 7ff1a9d4e5
commit 0055b2561e
2 changed files with 5 additions and 2 deletions

View File

@@ -49,7 +49,8 @@ RUNNERS = {
# command which builds the website # command which builds the website
# important: specify {output} as output path of the generator # important: specify {output} as output path of the generator
"build_command": ('tox -e pelican --result-json "{output}/result.json" ' # if you use toy you may use {toxresult} as the path to the result.json
"build_command": ('tox -e pelican --result-json "{toxresult}" '
'--recreate -- -d --output "{output}"'), '--recreate -- -d --output "{output}"'),
# will be added to env when running build_command # will be added to env when running build_command

View File

@@ -18,6 +18,7 @@ log = logging.getLogger(__name__)
log_git = partial(log_git_result, out_logger=log.debug, log_git = partial(log_git_result, out_logger=log.debug,
err_logger=log.debug, status_logger=log.debug) err_logger=log.debug, status_logger=log.debug)
TOX_RESULT_FILE = "{name}_result.json"
BUILD_REPO_DIR = "{name}_build_repo" BUILD_REPO_DIR = "{name}_build_repo"
OUTPUT_DIR = "{name}_output" OUTPUT_DIR = "{name}_output"
STATUS_LEN = 500 STATUS_LEN = 500
@@ -43,8 +44,9 @@ class DeploymentRunner:
self.build_repo_path = self.working_directory / BUILD_REPO_DIR.format( self.build_repo_path = self.working_directory / BUILD_REPO_DIR.format(
name=name) name=name)
outdir = self.working_directory / OUTPUT_DIR.format(name=name) outdir = self.working_directory / OUTPUT_DIR.format(name=name)
toxresult = self.working_directory / TOX_RESULT_FILE.format(name=name)
self.build_command = runner_config["build_command"].format( self.build_command = runner_config["build_command"].format(
output=outdir) output=outdir, toxresult=toxresult)
self.final_install_command = runner_config["final_install_command"]\ self.final_install_command = runner_config["final_install_command"]\
.format(output=outdir) .format(output=outdir)