Switching merge job to virtualenv

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

diff --git a/.gitignore b/.gitignore
index 4573c9d..10e8437 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ nosetests.xml
 .pydevproject
 coverage.xml
 .coverage
+.settings
+storperf.egg-info

diff --git a/ci/merge.sh b/ci/merge.sh
index 337fc55..ddcc0eb 100755 (executable)
--- a/ci/merge.sh
+++ b/ci/merge.sh
@@ -8,6 +8,20 @@
 # 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
+
+easy_install -U setuptools
+pip install nose -I
+pip install coverage -I
+python ci/setup.py develop
+
+
 if [ -x /usr/bin/flake8 ]; then
     flake8 storperf
 fi
@@ -17,3 +31,5 @@ nosetests --with-xunit \
          --cover-package=storperf\
          --cover-xml \
          storperf
+
+deactivate
\ No newline at end of file

diff --git a/ci/setup.py b/ci/setup.py
new file mode 100755 (executable)
index 0000000..c8d05e8
--- /dev/null
+++ b/ci/setup.py
@@ -0,0 +1,32 @@
+from setuptools import setup, find_packages
+
+
+setup(
+    name="storperf",
+    version="0.dev0",
+    packages=find_packages(),
+    include_package_data=True,
+    package_data={
+        'storperf': [
+            'storperf/resources/hot/*'
+        ]
+    },
+    url="https://www.opnfv.org",
+    install_requires=["coverage>=4.0.3",
+                      "flake8>=2.5.1",
+                      "flask>=0.10.1",
+                      "flask-restful>=0.3.5",
+                      "mock>=1.3",
+                      "pyyaml>=3.11",
+                      "python-cinderclient>=1.5.0",
+                      "python-heatclient>=0.8.0",
+                      "python-keystoneclient>=2.0.0",
+                      "python-novaclient>=3.1.0",
+                      "six==1.10.0"
+                      ],
+    entry_points={
+        'console_scripts': [
+            'storperf=storperf.main:main',
+        ],
+    }
+)