X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=7738aeda52368672754cfd21b4b9f8f93041052f;hb=d25197e5d50d6a01e07dd52a9ca4d9c6ee33fd32;hp=4b7ff6faf11c08fa249d48e06c19ebe4bd675241;hpb=f6fb85d278ada5d2a407c49a7f4c5de9c81b8d67;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 4b7ff6faf..7738aeda5 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -16,7 +16,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - danube:
+        - euphrates:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -58,6 +58,13 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 30
+            fail: true
+
     builders:
         - yardstick-unit-tests-and-docs-build
 
@@ -93,6 +100,12 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
 
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 30
+            fail: true
+
     builders:
         - yardstick-unit-tests-and-docs-build
 
@@ -108,19 +121,8 @@
             set -o errexit
             set -o pipefail
 
+            sudo apt-get install -y build-essential python-dev python3-dev
+
             echo "Running unit tests..."
             cd $WORKSPACE
-            virtualenv $WORKSPACE/yardstick_venv
-            source $WORKSPACE/yardstick_venv/bin/activate
-
-            # install python packages
-            sudo apt-get install -y build-essential python-dev python-pip python-pkg-resources
-            easy_install -U setuptools==33.1.1
-            easy_install -U pip
-            pip install -r requirements.txt || pip install -r tests/ci/requirements.txt
-            pip install -e .
-
-            # unit tests
-            ./run_tests.sh
-
-            deactivate
+            tox