merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / yardstick / yardstick-project-jobs.yml

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index a54750e..4b7ff6f 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -33,7 +33,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -70,7 +69,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
@@ -116,7 +114,8 @@
             source $WORKSPACE/yardstick_venv/bin/activate
 
             # install python packages
-            easy_install -U setuptools
+            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 .