From 57d102dc77d00b6523441267cec53e955dcf4199 Mon Sep 17 00:00:00 2001 From: Tyler Smith Date: Tue, 22 Oct 2019 12:52:38 -0400 Subject: [PATCH] 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 --- .zuul.yaml | 2 ++ tox.ini | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 31968dd3..c91b0e80 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -20,6 +20,8 @@ description: Run pylint for stx-gui vars: tox_envlist: pylint + tox_environment: + STX_DC_CLIENT: distcloud-client required-projects: - starlingx/config - starlingx/distcloud-client diff --git a/tox.ini b/tox.ini index 2badcee2..168c0525 100644 --- a/tox.ini +++ b/tox.ini @@ -4,12 +4,15 @@ minversion = 2.3 skipsdist = True 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] install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 + STX_DC_CLIENT = {env:STX_DC_CLIENT:git/distributedcloud-client} deps = -r{toxinidir}/test-requirements.txt [testenv:linters] @@ -50,7 +53,7 @@ usedevelop = False skip_install = True deps = {[testenv]deps} 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/sysinv/sysinv -e{[tox]stxdir}/fault/python-fmclient/fmclient