X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2FRO%2Finstall;h=4dfb011dd51a9c2b9911108d581131a8110a3254;hb=21ba9cee5d08c89b1f48c6fdfc83e04ec192f6a6;hp=2f6be01e0ab59b203be42d75a3dbc8cd37412ba4;hpb=a1fc4570e6196978b0de679c5e659748ba407e6d;p=osm%2Fdevops.git

diff --git a/jenkins/RO/install b/jenkins/RO/install
index 2f6be01e..4dfb011d 100755
--- a/jenkins/RO/install
+++ b/jenkins/RO/install
@@ -26,40 +26,22 @@ OSM_JENKINS=$(dirname $HERE)
 export OSM_MDG=RO
 OSM_load_config
 
-# Installation starts here
-apt-get update
-
-apt-get -y install python-pip
-pip install --upgrade pip
-pip install pyvcloud
-pip install progressbar
-pip install prettytable
-pip install pyvmomi
+. $OSM_JENKINS/common/install_common
 
-#Dependencies below will be installed directly from packages and must be removed
-#apt-get -y install libmysqlclient-dev libssl-dev libffi-dev mysql-client
-#apt-get -y install python-yaml python-bottle python-mysqldb python-jsonschema python-paramiko python-argcomplete python-requests python-logutils
-#apt-get -y install python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-mysqldb python-yaml
-#apt-get -y install python-boto
-
-#Release ONE
-curl https://osm-download.etsi.org/repository/osm/debian/ReleaseONE/OSM%20ETSI%20Release%20Key.gpg |apt-key add -
-add-apt-repository -y "deb https://osm-download.etsi.org/repository/osm/debian/ReleaseONE unstable RO openvim"
-#add-apt-repository -y "deb https://osm-download.etsi.org/repository/osm/debian/ReleaseONE stable RO openvim"
+# Installation starts here
 
 #Release TWO
-#curl https://osm-download.etsi.org/repository/osm/debian/ReleaseTWO/OSM%20ETSI%20Release%20Key.gpg |apt-key add -
-#add-apt-repository -y "deb https://osm-download.etsi.org/repository/osm/debian/ReleaseTWO stable RO openvim"
 
+DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata
 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"
 
-${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb || FATAL "osm-ro db installation failed"
-${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -u mano -p manopw -d mano_vim_db --updatedb || FATAL "lib-osm-openvim db installation failed"
+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"
 service osm-ro restart
 
 RC=$?