From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Tue, 5 Apr 2016 22:03:14 +0000 (-0700)
Subject: Fix artifacts-api dependencies and PATH
X-Git-Tag: colorado.1.0~592
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b9ff5ec4fdbc3db79c14735598df72b681fa87b8;p=releng.git

Fix artifacts-api dependencies and PATH

 - Include '/usr/local/bin' in PATH so gsutil can be used
 - Ensure the virtualenv uses python2.7 so SSL warnings go away
 - Remove 'easy_install' call as pip is already available in the
   virtualenv

Change-Id: I2b6f6a8bc284c580cc71ec0f02ebd88baf2de462
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1c9c32109..8c1539c8b 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -305,16 +305,16 @@
             #!/bin/bash
             set -o errexit
             set -o pipefail
+            export PATH=$PATH:/usr/local/bin/
 
-            echo "Generating Artifacts API ..."
-            virtualenv $WORKSPACE/releng_artifacts
+            virtualenv -p python2.7 $WORKSPACE/releng_artifacts
             source $WORKSPACE/releng_artifacts/bin/activate
 
             # install python packages
-            easy_install -U setuptools
             pip install google-api-python-client
 
             # generate and upload index file
+            echo "Generating Artifacts API ..."
             python $WORKSPACE/utils/opnfv-artifacts.py > index.json
             gsutil cp index.json gs://artifacts.opnfv.org/index.json