From f049bfa5f151f2af56ac507ca6851d60b4e4419e Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 9 Sep 2019 10:30:13 -0500 Subject: [PATCH] Minor zuul and tox cleanup related to package re-org The utilities repo is referenced by metal. The inventory tox.ini is not being triggered by zuul, but would have failed if run locally. Change-Id: I4cd044d8ad03fefa19189e790e4b87222bebc459 Story: 2006166 Task: 36532 Signed-off-by: Al Bailey --- .zuul.yaml | 1 + inventory/inventory/tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 80f5cd05..83b793a9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -25,6 +25,7 @@ - starlingx/integ - starlingx/nfv - starlingx/update + - starlingx/utilities vars: tox_envlist: functional devstack_services: diff --git a/inventory/inventory/tox.ini b/inventory/inventory/tox.ini index 965d37db..2ddf29a1 100644 --- a/inventory/inventory/tox.ini +++ b/inventory/inventory/tox.ini @@ -35,7 +35,7 @@ deps = -r{toxinidir}/requirements.txt -e{[tox]cgcsdir}/fault/python-fmclient/fmclient -e{[tox]cgcsdir}/config/controllerconfig/controllerconfig -e{[tox]cgcsdir}/update/cgcs-patch/cgcs-patch - -e{[tox]cgcsdir}/integ/utilities/platform-util/platform-util + -e{[tox]cgcsdir}/utilities/utilities/platform-util/platform-util commands = find . -type f -name "*.pyc" -delete @@ -63,7 +63,7 @@ deps = {[testenv]deps} -e{[tox]cgcsdir}/config/controllerconfig/controllerconfig -e{[tox]cgcsdir}/config/sysinv/cgts-client/cgts-client -e{[tox]cgcsdir}/update/cgcs-patch/cgcs-patch - -e{[tox]cgcsdir}/integ/utilities/platform-util/platform-util + -e{[tox]cgcsdir}/utilities/utilities/platform-util/platform-util setenv = VIRTUAL_ENV={envdir} PYTHON=coverage run --source inventory --parallel-mode