summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/genesis/genesis-fuel.yml10
-rwxr-xr-xutils/lab-reconfiguration/create_venv.sh10
2 files changed, 10 insertions, 10 deletions
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index f99fa9308..f13dc070c 100644
--- 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 e94b22b1b..4e45f8462 100755
--- 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