updates for R3 packaging improvements

[osm/devops.git] / jenkins / SO / install

diff --git a/jenkins/SO/install b/jenkins/SO/install
index d881a42..f83f82a 100755 (executable)
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -36,7 +36,7 @@ set -o nounset    # Expanding an unset variable is an error.  Variables must be
 ###############################################################################
 # Set up repo and version
 PLATFORM_REPOSITORY=OSM
-PLATFORM_VERSION=4.4.2.1.61839
+PLATFORM_VERSION=5.2.0.0.71033
 
 while getopts ":P:V:h" o; do
     case "${o}" in
@@ -94,8 +94,7 @@ apt-get update
 # and install the tools
 apt remove -y rw.toolchain-rwbase tcpdump
 apt-get install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION} python
-/usr/rift/container_tools/mkcontainer --modes ext --modes platform --rw-version ${PLATFORM_VERSION}
-pip3 install lxml==3.4.0
+/usr/rift/container_tools/mkcontainer --modes MANO-base --rw-version ${PLATFORM_VERSION}
 
 chmod 777 /usr/rift /usr/rift/usr/share
 
@@ -106,28 +105,14 @@ rm -f /etc/apt/sources.list.d/RIFT.list
 apt-get update
 
 apt-get install -y \
-            rw.core.mano-rwcal_yang_ylib-1.0 \
-            rw.core.mano-rwconfig_agent_yang_ylib-1.0 \
-            rw.core.mano-rwlaunchpad_yang_ylib-1.0 \
-            rw.core.mano-mano_yang_ylib-1.0 \
-            rw.core.mano-common-1.0 \
-            rw.core.mano-rwsdn_yang_ylib-1.0 \
-            rw.core.mano-rwsdnal_yang_ylib-1.0 \
-            rw.core.mano-mano-types_yang_ylib-1.0 \
-            rw.core.mano-rwcal-cloudsim-1.0 \
-            rw.core.mano-rwcal-1.0 \
-            rw.core.mano-rw_conman_yang_ylib-1.0 \
-            rw.core.mano-rwcalproxytasklet-1.0 \
-            rw.core.mano-rwlaunchpad-1.0 \
-            rw.core.mano-rwcal-openmano-vimconnector-1.0 \
-            rw.core.mano-lpmocklet_yang_ylib-1.0 \
-            rw.core.mano-rwmon-1.0 \
-            rw.core.mano-rwcloud_yang_ylib-1.0 \
-            rw.core.mano-rwcal-openstack-1.0 \
-            rw.core.mano-rw.core.mano_foss \
-            rw.core.mano-rwmon_yang_ylib-1.0 \
-            rw.core.mano-rwcm-1.0 \
-            rw.core.mano-rwcal-mock-1.0 \
-            rw.core.mano-rwcal-cloudsimproxy-1.0 \
-            rw.core.mano-models-1.0 \
-            rw.core.mano-rwcal-aws-1.0
+    rw.core.mano-mano-1.0 \
+    rw.core.mano-rwcal-plugin-aws-1.0 \
+    rw.core.mano-rwcal-plugin-cloudsim-1.0 \
+    rw.core.mano-rwcal-plugin-cloudsimproxy-1.0 \
+    rw.core.mano-rwcal-plugin-openmano-vimconnector-1.0 \
+    rw.core.mano-rwcal-plugin-openstack-1.0 \
+    rw.core.mano-rwcal-plugin-mock-1.0 
+
+
+
+