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

prefix directories in working dir

Browse Source
This commit is contained in:
Peter Dahlberg
2016-06-11 13:19:54 +02:00
parent 771af8ed17
commit e42b77e14b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pelican_deploy/deploy.py
View File

@@ -12,8 +12,8 @@ import atexit
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
BUILD_REPO_DIR = "build_repo" BUILD_REPO_DIR = "{name}_build_repo"
OUTPUT_DIR = "output" OUTPUT_DIR = "{name}_output"
class DeploymentRunner: class DeploymentRunner:
@@ -30,9 +30,10 @@ class DeploymentRunner:
self.clone_url = runner_config["clone_url"] self.clone_url = runner_config["clone_url"]
self.git_branch = runner_config["git_branch"] self.git_branch = runner_config["git_branch"]
self.target_directory = runner_config["target_directory"] self.target_directory = runner_config["target_directory"]
self.build_repo_path = self.working_directory / BUILD_REPO_DIR self.build_repo_path = self.working_directory / BUILD_REPO_DIR.format(
name=name)
self.pelican_command = runner_config["pelican_command"].format( self.pelican_command = runner_config["pelican_command"].format(
output=OUTPUT_DIR) output=OUTPUT_DIR.format(name=name))
self.build_proc_env = dict(os.environ, self.build_proc_env = dict(os.environ,
**runner_config.get("pelican_env", {})) **runner_config.get("pelican_env", {}))
@@ -49,8 +50,9 @@ class DeploymentRunner:
except (InvalidGitRepositoryError, NoSuchPathError) as e: except (InvalidGitRepositoryError, NoSuchPathError) as e:
if self.build_repo_path.is_dir() and \ if self.build_repo_path.is_dir() and \
next(self.build_repo_path.iterdir(), None) is not None: next(self.build_repo_path.iterdir(), None) is not None:
log.error("non-empty %s exists but not a valid git repository!", log.error(
self.build_repo_path) "non-empty %s exists but not a valid git repository!",
self.build_repo_path)
raise raise
else: else:
log.info("Build repository %s not there, cloneing", e) log.info("Build repository %s not there, cloneing", e)