zuul/zuul-jobs
Code Issues Proposed changes

Merge "Work around non-standard envdir locations"

Browse Source
This commit is contained in:
Zuul
2017-10-16 18:10:06 +00:00
committed by Gerrit Code Review
parent 1253d3da37 3baed35ccc
commit bf3f9aacab
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/tox-siblings/library/tox_install_sibling_packages.py
View File

@@ -112,13 +112,17 @@ def main():
module.exit_json(
changed=False, msg="No name in setup.cfg, skipping siblings")
tox_python = '{project_dir}/.tox/{envlist}/bin/python'.format(
envdir = '{project_dir}/.tox/{envlist}'.format(
project_dir=project_dir, envlist=envlist)
if not os.path.exists(envdir):
module.exit_json(
changed=False, msg="envdir does not exist, skipping siblings")
tox_python = '{envdir}/bin/python'.format(envdir=envdir)
# Write a log file into the .tox dir so that it'll get picked up
# Name it with envlist as a prefix so that fetch-tox-output will properly
# get it in a multi-env scenario
log_dir = '{project_dir}/.tox/{envlist}/log'.format(
project_dir=project_dir, envlist=envlist)
log_dir = '{envdir}/log'.format(envdir=envdir)
log_file = '{log_dir}/{envlist}-siblings.txt'.format(
log_dir=log_dir, envlist=envlist)