From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 21 Sep 2017 10:04:11 +0000 (+0200)
Subject: IM added to the apt-repo deb rule; fixes in RO install related to osm-im
X-Git-Tag: v3.0.0rc~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d969d9cd5423f44ee89ea4051512abc8b8fcd42c;p=osm%2Fdevops.git

IM added to the apt-repo deb rule; fixes in RO install related to osm-im

Change-Id: Ifc939d18f400c59bc3adc8b9c6f151b9f330b7e2
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/jenkins/RO/install b/jenkins/RO/install
index 9eb555c2..2f3ca93f 100755
--- a/jenkins/RO/install
+++ b/jenkins/RO/install
@@ -33,11 +33,11 @@ OSM_load_config
 #Release TWO
 
 apt-get update
-apt-get -y install python-lib-osm-openvim
 apt-get -y install python-osm-ro
 
-OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "lib-osm-openvim was not properly installed"
-OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "osm-ro was not properly installed"
+OSMIM_PATH=`python -c 'import osm_im; print osm_im.__path__[0]'` || FATAL "python-osm-im was not properly installed"
+OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "python-lib-osm-openvim was not properly installed"
+OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "python-osm-ro was not properly installed"
 
 DEBIAN_FRONTEND=noninteractive ${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb || FATAL "osm-ro db installation failed"
 DEBIAN_FRONTEND=noninteractive ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -u mano -p manopw -d mano_vim_db --updatedb || FATAL "lib-osm-openvim db installation failed"
diff --git a/jenkins/common/install_common b/jenkins/common/install_common
index d9c1338c..2cee8628 100755
--- a/jenkins/common/install_common
+++ b/jenkins/common/install_common
@@ -45,4 +45,4 @@ key_location=$REPOSITORY_BASE/$RELEASE/$REPOSITORY_KEY
 
 curl $key_location | apt-key add -
 
-apt-get update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO osmclient openvim"
+apt-get update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO IM osmclient openvim"