From 1b8a492ee14fefa3398170c99a005d6dab136782 Mon Sep 17 00:00:00 2001
From: Bart Wensley <barton.wensley@windriver.com>
Date: Fri, 7 Sep 2018 07:51:43 -0500
Subject: [PATCH] Enable zuul check and gate for unit tests

Enabling zuul check and gate for controllerconfig and
configutilities unit tests.

Story: 2003360
Task: 26216

Change-Id: I6e4807054b793937cef7d549d8bdec058ee26e1c
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
---
 .zuul.yaml                                | 50 ++++++++++++++++++++++-
 configutilities/configutilities/tox.ini   |  3 ++
 controllerconfig/controllerconfig/tox.ini |  6 ++-
 tox.ini                                   |  6 +++
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 96eb9d74d7..059f78ae2a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,9 +6,16 @@
             voting: false
         - sysinv-tox-unittest:
             voting: false
+        - controllerconfig-tox-flake8
+        - controllerconfig-tox-py27
+        - controllerconfig-tox-pylint
+        - configutilities-tox-flake8
     gate:
       jobs:
-        - noop
+        - controllerconfig-tox-flake8
+        - controllerconfig-tox-py27
+        - controllerconfig-tox-pylint
+        - configutilities-tox-flake8
 
 - job:
     name: sysinv-tox-unittest
@@ -22,3 +29,44 @@
     vars:
       tox_envlist: py27
       tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini
+
+- job:
+    name: controllerconfig-tox-flake8
+    parent: tox
+    description: Run flake8 tests for controllerconfig
+    required-projects:
+      - openstack/stx-update
+      - openstack/stx-fault
+    vars:
+      tox_envlist: flake8
+      tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
+
+- job:
+    name: controllerconfig-tox-py27
+    parent: tox
+    description: Run py27 tests for controllerconfig
+    required-projects:
+      - openstack/stx-update
+      - openstack/stx-fault
+    vars:
+      tox_envlist: py27
+      tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
+
+- job:
+    name: controllerconfig-tox-pylint
+    parent: tox
+    description: Run pylint tests for controllerconfig
+    required-projects:
+      - openstack/stx-update
+      - openstack/stx-fault
+    vars:
+      tox_envlist: pylint
+      tox_extra_args: -c controllerconfig/controllerconfig/tox.ini
+
+- job:
+    name: configutilities-tox-flake8
+    parent: tox
+    description: Run flake8 tests for configutilities
+    vars:
+      tox_envlist: flake8
+      tox_extra_args: -c configutilities/configutilities/tox.ini
diff --git a/configutilities/configutilities/tox.ini b/configutilities/configutilities/tox.ini
index 9f682d2f96..8c979758b7 100644
--- a/configutilities/configutilities/tox.ini
+++ b/configutilities/configutilities/tox.ini
@@ -13,6 +13,9 @@ wrsdir = {toxinidir}/../../../../../../../../..
 whitelist_externals = find
 install_command = pip install --no-cache-dir {opts} {packages}
 
+[testenv:venv]
+commands = {posargs}
+
 [testenv:flake8]
 basepython = python2.7
 deps = flake8
diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini
index 15eb95aaf3..4d023f5f0b 100644
--- a/controllerconfig/controllerconfig/tox.ini
+++ b/controllerconfig/controllerconfig/tox.ini
@@ -7,8 +7,7 @@
 envlist = flake8, py27, pylint
 # Tox does not work if the path to the workdir is too long, so move it to /tmp
 toxworkdir = /tmp/{env:USER}_cctox
-wrsdir = {toxinidir}/../../../..
-stxdir = {[tox]wrsdir}/stx
+stxdir = {toxinidir}/../../..
 
 [testenv]
 whitelist_externals = find
@@ -21,6 +20,9 @@ deps = -r{toxinidir}/requirements.txt
        -e{[tox]stxdir}/stx-config/sysinv/sysinv/sysinv
        -e{[tox]stxdir}/stx-config/sysinv/cgts-client/cgts-client
 
+[testenv:venv]
+commands = {posargs}
+
 [testenv:pylint]
 basepython = python2.7
 deps = {[testenv]deps}
diff --git a/tox.ini b/tox.ini
index c2904c9012..d2752bdb04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,3 +38,9 @@ commands =
 
 [testenv:venv]
 commands = {posargs}
+
+[testenv:flake8]
+description = Dummy environment to allow flake8 to be run in subdir tox
+
+[testenv:pylint]
+description = Dummy environment to allow pylint to be run in subdir tox