Revision 6058ae72 ci/utils.py
| b/ci/utils.py | ||
|---|---|---|
| 150 | 150 |
temp_config = self.config.get('Global', 'temporary_config')
|
| 151 | 151 |
self.temp_config = ConfigParser() |
| 152 | 152 |
self.temp_config.optionxform = str |
| 153 |
self.temp_config.read(temp_config)
|
|
| 153 |
self.temp_config.read(os.path.expanduser(temp_config))
|
|
| 154 | 154 |
self.build_id = build_id |
| 155 | 155 |
self.logger.info("Will use \"%s\" as build id" % _green(self.build_id))
|
| 156 | 156 |
|
| ... | ... | |
| 426 | 426 |
ssh_keys = self.config.get("Deployment", "ssh_keys")
|
| 427 | 427 |
|
| 428 | 428 |
if ssh_keys != "": |
| 429 |
ssh_keys = os.path.expanduser(ssh_keys) |
|
| 429 | 430 |
self.logger.debug("Will use %s authentication keys file" % ssh_keys)
|
| 430 | 431 |
keyfile = '/tmp/%s.pub' % fabric.env.user |
| 431 | 432 |
_run('mkdir -p ~/.ssh && chmod 700 ~/.ssh', False)
|
| ... | ... | |
| 442 | 443 |
_put(ssh_keys, keyfile) |
| 443 | 444 |
else: |
| 444 | 445 |
self.logger.debug("No ssh keys found")
|
| 446 |
return |
|
| 445 | 447 |
_run('cat %s >> ~/.ssh/authorized_keys' % keyfile, False)
|
| 446 | 448 |
_run('rm %s' % keyfile, False)
|
| 447 | 449 |
self.logger.debug("Uploaded ssh authorized keys")
|
| ... | ... | |
| 756 | 758 |
"""Fetch Synnefo packages""" |
| 757 | 759 |
if dest is None: |
| 758 | 760 |
dest = self.config.get('Global', 'pkgs_dir')
|
| 759 |
dest = os.path.abspath(dest)
|
|
| 761 |
dest = os.path.abspath(os.path.expanduser(dest))
|
|
| 760 | 762 |
if not os.path.exists(dest): |
| 761 | 763 |
os.makedirs(dest) |
| 762 | 764 |
self.fetch_compressed("synnefo_build-area", dest)
|
Also available in: Unified diff