summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2016-04-05 15:03:14 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2016-04-05 15:40:45 -0700
commitb9ff5ec4fdbc3db79c14735598df72b681fa87b8 (patch)
treeee32af6ce46b57fe6f404c302690f9290696a836
parentbf3f0a58b5ddf71a85eee8cf48088dde0292c784 (diff)
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>
-rw-r--r--jjb/releng-macros.yaml6
1 files changed, 3 insertions, 3 deletions
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