Merge "Disable Fuel Healthcheck temporarily because of Opendaylight it will fail...

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 19f9dba..fb25b07 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -533,6 +533,16 @@
             set -o nounset
             set -o pipefail
 
+            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
+            fi
+
+            if [[ ! $(gem list | grep fpm) ]]; then
+                echo "fpm gem not found, but required for Fuel Plugin build ... attempting to install"
+                sudo gem install fpm
+            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/create_venv.sh b/utils/lab-reconfiguration/create_venv.sh
index e94b22b..4e45f84 100755 (executable)
--- a/utils/lab-reconfiguration/create_venv.sh
+++ b/utils/lab-reconfiguration/create_venv.sh
@@ -30,16 +30,6 @@ if [[ ! $(rpm -qa | grep python-2.7) ]]; then
     sudo yum install -y python-2.7*
 fi
 
-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
-fi
-
-if [[ ! $(gem list | grep fpm) ]]; then
-    echo "fpm gem not found, but required for Fuel Plugin build ... attempting to install"
-    sudo gem install fpm
-fi
-
 if [ ! -f "$BASEDIR/venv/updated" -o $BASEDIR/requirements.pip -nt $BASEDIR/venv/updated ]; then
     source $BASEDIR/venv/bin/activate
     pip install -r $BASEDIR/requirements.pip