Merge "Allow jobs to pick arbitrary version of InfraRed"
This commit is contained in:
commit
19c19ed06b
6
tox.ini
6
tox.ini
|
@ -185,7 +185,7 @@ setenv =
|
|||
|
||||
# On RedHat Linux must use the default unversioned python because of dependency on native SELinux
|
||||
# package available only for /usr/bin/python interpreter
|
||||
basepython = {env:IR_PYTHON:python}
|
||||
basepython = {env:IR_PYTHON:python3}
|
||||
usedevelop = false
|
||||
skipdist = true
|
||||
skip_install = true
|
||||
|
@ -195,7 +195,8 @@ whitelist_externals =
|
|||
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE}
|
||||
-rinfrared_plugin/requirements.txt
|
||||
{env:IR_DEPS}
|
||||
|
||||
passenv =
|
||||
{[testenv]passenv}
|
||||
ANSIBLE_*
|
||||
|
@ -206,6 +207,7 @@ setenv =
|
|||
{[testenv]setenv}
|
||||
ANSIBLE_CONFIG = {env:ANSIBLE_CONFIG:{toxinidir}/ansible.cfg}
|
||||
ANSIBLE_INVENTORY = {env:ANSIBLE_INVENTORY:{toxinidir}/ansible_hosts}
|
||||
IR_DEPS = {env:IR_DEPS:-r{toxinidir}/infrared_plugin/requirements.txt}
|
||||
IR_HOME = {env:IR_HOME:{envdir}/home/infrared}
|
||||
IR_TOBIKO_PLUGIN = {env:IR_TOBIKO_PLUGIN:{toxinidir}/infrared_plugin}
|
||||
IR_WORKSPACE_FILE = {env:IR_WORKSPACE_FILE:{toxinidir}/workspace.tgz}
|
||||
|
|
Loading…
Reference in New Issue