From 75ad1dc73dc3784053dbd0d02315a1219eaf31c0 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Sat, 19 Sep 2015 01:43:22 +0200
Subject: 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>
---
 jjb/genesis/genesis-fuel.yml               | 10 ++++++++--
 utils/lab-reconfiguration/requirements.pip |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index fb25b07b6..fb365f589 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 dd3207b0e..8cd1db0ba 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
-- 
cgit 1.2.3-korg