From: Kristian Hunt <kristian.hunt@gmail.com>
Date: Thu, 13 Aug 2015 07:20:35 +0000 (+0200)
Subject: Update setuptools in yardstick verify and merge jobs
X-Git-Tag: arno.2015.2.0~129
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F1177%2F2;p=releng.git

Update setuptools in yardstick verify and merge jobs

New virtualenv comes bundled with setuptools 5.5.1 while yardstick
requires >=6.1.

JIRA: YARDSTICK-29

Change-Id: Ia5f44c9c888a5461d3a4ed71a9d60f7c20bd8539
Signed-off-by: Kristian Hunt <kristian.hunt@gmail.com>
---

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index b11f006bd..87199b531 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -138,6 +138,7 @@
             cd $WORKSPACE
             virtualenv $WORKSPACE/yardstick_venv
             source $WORKSPACE/yardstick_venv/bin/activate
+            easy_install -U setuptools
             python setup.py develop > /dev/null 2>&1
             ./run_tests.sh
             deactivate
@@ -200,6 +201,7 @@
             cd $WORKSPACE
             virtualenv $WORKSPACE/yardstick_venv
             source $WORKSPACE/yardstick_venv/bin/activate
+            easy_install -U setuptools
             python setup.py develop > /dev/null 2>&1
             ./run_tests.sh
             deactivate