From 6c01c0163fcdb8f176af3a978eb602a696b80eb8 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 25 Jun 2012 09:58:16 -0500
Subject: [PATCH] Backport tox settings to unbreak jenkins jobs.

The stable/essex tox config for nova does not currently match the
testing standards that jenkins expects. This backports in current
changes so that jenkins coverage jobs should start passing for
stable/essex.

Change-Id: I0fd476c38d9aea7d1c60cb959d8c7ac30e515d77
---
 setup.cfg |  8 +++-----
 tox.ini   | 29 +++++++++--------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6588b199f759..cc660490496b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,8 +25,6 @@ output_file = nova/locale/nova.pot
 [nosetests]
 verbosity=2
 detailed-errors=1
-with-openstack=1
-openstack-red=0.05
-openstack-yellow=0.025
-openstack-show-elapsed=1
-openstack-color=1
+cover-package = nova
+cover-html = true
+cover-erase = true
diff --git a/tox.ini b/tox.ini
index 123558d357c2..48d60c153f11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,36 +3,25 @@ envlist = py26,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
+         NOSE_WITH_OPENSTACK=1
+         NOSE_OPENSTACK_COLOR=1
+         NOSE_OPENSTACK_RED=0.05
+         NOSE_OPENSTACK_YELLOW=0.025
+         NOSE_OPENSTACK_SHOW_ELAPSED=1
+         NOSE_OPENSTACK_STDOUT=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
 commands = /bin/bash run_tests.sh -N -P
 
-[testenv:hudson]
+[tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
 deps = pep8==1.0.1
 commands = /bin/bash run_tests.sh -N --pep8
 
-[testenv:coverage]
-commands = /bin/bash run_tests.sh -N -P --coverage
+[testenv:cover]
+setenv = NOSE_WITH_COVERAGE=1
 
 [testenv:venv]
 commands = {posargs}
-
-[testenv:jenkins26]
-basepython = python2.6
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkins27]
-basepython = python2.7
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
-commands = /bin/bash run_tests.sh -N --coverage
-
-[testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
-commands = {posargs}
-