From f78146bac68fd308387950a4c5ed81cf08b668a0 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 10 Aug 2018 14:27:56 +1000 Subject: [PATCH] linters: Take a guess at the roles path It's probably reasonable to assume that for interactive use, the required roles for linting in zuul-jobs and openstack-zuul-jobs are in sibling directories of project-config. Set this as the default environment value. Change-Id: I388fdae998ac3cb87c30616ed761c888e1e429f0 --- tox.ini | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 430e318b10..cca369da36 100644 --- a/tox.ini +++ b/tox.ini @@ -12,11 +12,18 @@ basepython = python3 whitelist_externals = bash setenv = ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library -passenv = - # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need - # to export ANSIBLE_ROLES_PATH pointing to the currect repos. + # NOTE(pabelanger): if you'd like to run tox -elinters locally, + # you'll need to export ANSIBLE_ROLES_PATH pointing to the required + # repos. + # + # We take a guess that zuul-jobs and openstack-zuul-jobs will be + # checked out in the directory above us (i.e. alongside + # project-config). You may need to override this. Make sure + # they're up to date too! + # # see openstack-zuul-jobs-linters job for more information. - ANSIBLE_ROLES_PATH + ANSIBLE_ROLES_PATH={env:ANSIBLE_ROLES_PATH:../zuul-jobs/roles:../openstack-zuul-jobs/roles:roles} + # Add dependencies here since other jobs use python2 and zuul requires # python3. deps =