Merge "Minor zuul and tox file cleanup after manifest re-org"

.gitignore

@@ -9,6 +9,7 @@
 .*.swp
 .coverage
 .installed.cfg
+.stestr
 .testrepository
 .tox
 .venv

.zuul.yaml

@@ -96,8 +96,6 @@
     files:
       - controllerconfig/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: flake8
       tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
 
@@ -106,13 +104,10 @@
     parent: tox
     description: Run py27 tests for controllerconfig
     required-projects:
-      - starlingx/update
       - starlingx/fault
     files:
       - controllerconfig/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: py27
       tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
 
@@ -121,13 +116,10 @@
     parent: tox
     description: Run pylint tests for controllerconfig
     required-projects:
-      - starlingx/update
       - starlingx/fault
     files:
       - controllerconfig/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: pylint
       tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
 
@@ -162,13 +154,7 @@
       Run py27 test for cgts-client
     files:
       - sysinv/cgts-client/*
-    required-projects:
-      - starlingx/update
-      - starlingx/fault
-      - starlingx/integ
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: py27
       tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini
 
@@ -180,8 +166,6 @@
     files:
       - sysinv/cgts-client/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: pep8
       tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini
 
@@ -192,12 +176,6 @@
       Run pylint test for cgts-client
     files:
       - sysinv/cgts-client/*
-    required-projects:
-      - starlingx/update
-      - starlingx/fault
-      - starlingx/integ
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: pylint
       tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini

controllerconfig/controllerconfig/tox.ini

@@ -16,16 +16,12 @@ install_command = pip install \
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
     {opts} {packages}
 
-# Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-".
-# Zuul sets STX_PREFIX to an empty string.
-setenv = STX_PREFIX = {env:STX_PREFIX:stx-}
-
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -e{[tox]stxdir}/{env:STX_PREFIX}fault/fm-api
+       -e{[tox]stxdir}/fault/fm-api
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/tsconfig/tsconfig
+       -e{[tox]stxdir}/config/tsconfig/tsconfig
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/sysinv/sysinv/sysinv
+       -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/sysinv/cgts-client/cgts-client
+       -e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
 
 [testenv:venv]
 commands = {posargs}

sysinv/cgts-client/cgts-client/tox.ini

@@ -9,13 +9,10 @@ stxdir = {toxinidir}/../../../..
 distshare={toxworkdir}/.tox/distshare
 
 [testenv]
-# Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-".
-# Zuul sets STX_PREFIX to an empty string.
 setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
          OS_TEST_PATH=cgtsclient/tests
          TESTR_START_DIR=cgtsclient/tests
-         STX_PREFIX = {env:STX_PREFIX:stx-}
 basepython = python2.7
 usedevelop = True
 install_command = pip install \
@@ -24,7 +21,7 @@ install_command = pip install \
     {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/tsconfig/tsconfig
+       -e{[tox]stxdir}/config/tsconfig/tsconfig
 
 commands =
   find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete