Fixing tox in developer environments
Changing zuul to use a different path to distcloud-client than in developer environments. Change-Id: I90e5da2bb2f3ee15e4600fb281b19f6982fc50b1 Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
This commit is contained in:
parent
a13e9751c7
commit
57d102dc77
|
@ -20,6 +20,8 @@
|
||||||
description: Run pylint for stx-gui
|
description: Run pylint for stx-gui
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: pylint
|
tox_envlist: pylint
|
||||||
|
tox_environment:
|
||||||
|
STX_DC_CLIENT: distcloud-client
|
||||||
required-projects:
|
required-projects:
|
||||||
- starlingx/config
|
- starlingx/config
|
||||||
- starlingx/distcloud-client
|
- starlingx/distcloud-client
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -4,12 +4,15 @@ minversion = 2.3
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
stxdir = {toxinidir}/..
|
stxdir = {toxinidir}/..
|
||||||
|
|
||||||
|
# Note: STX_DC_CLIENT is set by zuul to be distcloud-client, it is
|
||||||
|
# defaulted here to the path that works in developer environments
|
||||||
[testenv]
|
[testenv]
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDERR_CAPTURE=1
|
||||||
OS_TEST_TIMEOUT=60
|
OS_TEST_TIMEOUT=60
|
||||||
|
STX_DC_CLIENT = {env:STX_DC_CLIENT:git/distributedcloud-client}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
|
@ -50,7 +53,7 @@ usedevelop = False
|
||||||
skip_install = True
|
skip_install = True
|
||||||
deps = {[testenv]deps}
|
deps = {[testenv]deps}
|
||||||
git+git://github.com/starlingx-staging/stx-horizon.git
|
git+git://github.com/starlingx-staging/stx-horizon.git
|
||||||
-e{[tox]stxdir}/distcloud-client
|
-e{[tox]stxdir}/{env:STX_DC_CLIENT}
|
||||||
-e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
|
-e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
|
||||||
-e{[tox]stxdir}/config/sysinv/sysinv/sysinv
|
-e{[tox]stxdir}/config/sysinv/sysinv/sysinv
|
||||||
-e{[tox]stxdir}/fault/python-fmclient/fmclient
|
-e{[tox]stxdir}/fault/python-fmclient/fmclient
|
||||||
|
|
Loading…
Reference in New Issue