From 592d1790c7c4515bc9dd7d9d851c88c4c8228ec3 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Wed, 28 Mar 2018 17:05:20 -0700
Subject: [PATCH] Set lower-constraint to run unit and functional

This sets up the lower-constraint tox environment to run both the unit and
functional tests. This should provide better coverage.

Change-Id: Ibef3a77ccdd5ee19ead8f9932f58f96b61ed7aa5
---
 tox.ini              | 4 ++++
 zuul.d/project.yaml  | 7 -------
 zuul.d/projects.yaml | 2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 zuul.d/project.yaml

diff --git a/tox.ini b/tox.ini
index 7b85947dc1..cf757d0b25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -176,3 +176,7 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
+whitelist_externals = sh
+commands =
+    sh -c 'OS_TEST_PATH={toxinidir}/octavia/tests/unit stestr run {posargs}'
+    sh -c 'OS_TEST_PATH={toxinidir}/octavia/tests/functional stestr run {posargs}'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
deleted file mode 100644
index 67a39c429e..0000000000
--- a/zuul.d/project.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    check:
-      jobs:
-        - openstack-tox-lower-constraints
-    gate:
-      jobs:
-        - openstack-tox-lower-constraints
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 9e32cf75b6..6ce6ec4024 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -11,6 +11,7 @@
         - neutron-lbaasv2-dsvm-py3x-scenario:
             branches: ^(?!stable/ocata).*$
             voting: false
+        - openstack-tox-lower-constraints
         - openstack-tox-functional:
             irrelevant-files:
               - ^.*\.rst$
@@ -39,6 +40,7 @@
     gate:
       queue: octavia
       jobs:
+        - openstack-tox-lower-constraints
         - openstack-tox-functional:
             irrelevant-files:
               - ^.*\.rst$