4 files changed, 31 insertions, 27 deletions

diff --git a/jjb/test-requirements.txt b/jjb/test-requirements.txt
deleted file mode 100644
index 6b700dcfc..000000000
--- a/jjb/test-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-jenkins-job-builder
diff --git a/modules/tox.ini b/modules/tox.ini
new file mode 100644
index 000000000..835cb6ba2
--- /dev/null
+++ b/modules/tox.ini
@@ -0,0 +1,28 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27
+skipsdist = True
+
+[testenv]
+usedevelop = True
+setenv=
+  HOME = {envtmpdir}
+  PYTHONPATH = {toxinidir}
+
+[testenv:modules]
+deps=
+  -rrequirements.txt
+  -rtest-requirements.txt
+commands =
+  nosetests \
+  --with-xunit \
+  --xunit-file=nosetests.xml \
+  --cover-package=opnfv \
+  --with-coverage \
+  --cover-xml \
+  --cover-html \
+  tests/unit
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 3c934085d..000000000
--- a/setup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-
-setup(
-    name="releng",
-    version="master",
-    url="https://www.opnfv.org",
-)
diff --git a/tox.ini b/tox.ini
index e9f5fbb0b..d3489e5b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,27 +8,13 @@ envlist = py27
 skipsdist = True
 
 [testenv]
-usedevelop = True
+usedevelop = False
 setenv=
   HOME = {envtmpdir}
   PYTHONPATH = {toxinidir}
 
 [testenv:jjb]
 deps =
-	-rjjb/test-requirements.txt
+  jenkins-job-builder==1.6.1
 commands=
-	jenkins-jobs test -o job_output -r jjb/
-
-[testenv:modules]
-deps=
-	-rmodules/requirements.txt
-	-rmodules/test-requirements.txt
-commands =
-	nosetests -w modules \
-	--with-xunit \
-	--xunit-file=modules/nosetests.xml \
-	--cover-package=opnfv \
-	--with-coverage \
-	--cover-xml \
-	--cover-html \
-	tests/unit
+  jenkins-jobs test -o job_output -r jjb/