diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-09-19 01:18:20 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-09-18 23:22:32 +0000 |
| commit | 4f14fb148999f57ef3efd79102447be0db1f11ac (patch) | |
| tree | 31a9d7d44675b5067708ba2fc4eb8207f2229bac | |
| parent | f875d7938f019110a53c1726789d3996b3c1ba05 (diff) | |
Bugfix: Fix lab reconfig issue by moving fuel dependency installation to master node
ODL plugin build dependency installation was incorrectly put into lab-reconfig
which runs on master node. This change moves the dependency installation into
fuel-odl-plugin-build builder which runs on jumphost.
Change-Id: Ic353cabeabb0a98fcdb8b2f94ababbbc79d3e963
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 10 | ||||
| -rwxr-xr-x | utils/lab-reconfiguration/create_venv.sh | 10 |
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 |