X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=643c1f9325703ae37b5041be5d21e4481734f85c;hb=269aaa60e72d672bcd66e03a8eaf30110df741a5;hp=afa6b784403e229262331d0b52ac0b63707c87a1;hpb=d6e609cd29998ea7c146eea48fbaa40994f4e29f;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index afa6b7844..643c1f932 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
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -33,15 +33,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -62,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
 
@@ -73,7 +76,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
@@ -82,10 +84,7 @@
             description: "Directory where the build artifact will be located upon the completion     of the build."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
@@ -101,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
 
@@ -116,18 +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
-            easy_install -U setuptools
-            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