Merge "Minor zuul and tox cleanup related to package re-org"

.zuul.yaml

@@ -25,6 +25,7 @@
       - starlingx/integ
       - starlingx/nfv
       - starlingx/update
+      - starlingx/utilities
     vars:
       tox_envlist: functional
       devstack_services:

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