summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-09-19 01:43:22 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-09-21 08:33:40 +0000
commit75ad1dc73dc3784053dbd0d02315a1219eaf31c0 (patch)
tree371ebd9b5da517dc7da340cd04e63436b204faa7
parent2b29b25aac6ac1d29eca3f86333247eff7ddfb7d (diff)
Install fuel-plugin-builder pip for fuel-odl-plugin build
This change also includes these - Remove unnecessary dependency from lab-reconfig venv - Rename fuel-opendaylight-plugin-build builder to fuel-odl-plugin-build Change-Id: I04e3966c7826b1517878d2f311dfc4d7d9bc8fa6 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/genesis/genesis-fuel.yml10
-rw-r--r--utils/lab-reconfiguration/requirements.pip1
2 files changed, 8 insertions, 3 deletions
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index fb25b07..fb365f5 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -374,7 +374,7 @@
builders:
- 'fuel-download-artifact'
- - 'fuel-opendaylight-plugin-build'
+ - 'fuel-odl-plugin-build'
- 'fuel-deploy'
publishers:
@@ -525,7 +525,7 @@
echo "Done!"
- builder:
- name: 'fuel-opendaylight-plugin-build'
+ name: 'fuel-odl-plugin-build'
builders:
- shell: |
#!/bin/bash
@@ -533,6 +533,7 @@
set -o nounset
set -o pipefail
+ # install dependencies if they are not available already
if [[ ! $(rpm -qa | grep rubygems) ]]; then
echo "Rubygems not found, but required for Fuel Plugin build ... attempting to install"
sudo yum install -y rubygems ruby-devel
@@ -543,6 +544,11 @@
sudo gem install fpm
fi
+ if [[ ! $(pip list | grep fuel-plugin-builder) ]]; then
+ echo "fuel-plugin-builder not found, but required for Fuel Plugin build ... attempting to install"
+ sudo pip install fuel-plugin-builder
+ fi
+
# log info to console
echo "Starting the build of Fuel Opendaylight Plugin. This could take some time..."
echo "--------------------------------------------------------"
diff --git a/utils/lab-reconfiguration/requirements.pip b/utils/lab-reconfiguration/requirements.pip
index dd3207b..8cd1db0 100644
--- a/utils/lab-reconfiguration/requirements.pip
+++ b/utils/lab-reconfiguration/requirements.pip
@@ -1,3 +1,2 @@
UcsSdk==0.8.2.2
PyYAML
-fuel-plugin-builder \ No newline at end of file