Tests in verify

Run the tests in the verify command instead
of just merge so that way patches can be
rejected if tests fail

Change-Id: I8907618a324296460a71a51d087926f9089e0d21
Signed-off-by: Mark Beierl <mark.beierl@emc.com>

1 files changed, 2 insertions, 25 deletions

diff --git a/ci/merge.sh b/ci/merge.sh
index ca55281..80ffdb6 100755
--- a/ci/merge.sh
+++ b/ci/merge.sh
@@ -8,28 +8,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-if [ -z $WORKSPACE ]
-then
-    WORKSPACE="$HOME"
-fi
-
-virtualenv $WORKSPACE/storperf_venv
-source $WORKSPACE/storperf_venv/bin/activate
-
-pip install --upgrade setuptools
-pip install nose -I
-pip install coverage -I
-python ci/setup.py develop
-
-
-if [ -x /usr/bin/flake8 ]; then
-    flake8 storperf
-fi
-
-nosetests --with-xunit \
-         --with-coverage \
-         --cover-package=storperf\
-         --cover-xml \
-         storperf
-
-deactivate
\ No newline at end of file
+# Just run the verify again for now
+`dirname $0`/verify.sh
\ No newline at end of file