X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2FSO%2Finstall;h=7ca6b901ef78f1b0258322585e0f4aeaa0efdac6;hb=369fbb2d21a709995e6f8b71765b8ca39de15dd7;hp=1f44210c97d85948373f857f7d0a1ea73dd1e649;hpb=61d476da11d9da3a22865662d93ade39227df413;p=osm%2Fdevops.git

diff --git a/jenkins/SO/install b/jenkins/SO/install
index 1f44210c..7ca6b901 100755
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -23,39 +23,57 @@
 # install launchpad SO and all of its dependencies
 #
 
+HERE=$(realpath $(dirname $0))
+OSM_JENKINS=$(dirname $HERE)
+. $OSM_JENKINS/common/install_common
+
 # Defensive bash programming flags
 set -o errexit    # Exit on any error
 trap 'echo ERROR: Command failed: \"$BASH_COMMAND\"' ERR
 set -o nounset    # Expanding an unset variable is an error.  Variables must be
                   # set before they can be used.
 
-if [ $# -gt 0 ]; then
-    case "$1" in
-	-h|--help)
-	    echo
-	    echo "NAME:"
-	    echo "  $0"
-	    echo
-	    echo "SYNOPSIS:"
-	    echo "  $0 -h|--help"
-	    echo "  $0 [PLATFORM_REPOSITORY] [PLATFORM_VERSION]"
-	    echo
-	    echo "DESCRIPTION:"
-	    echo "  Prepare current system to run SO and UI."
-	    echo
-	    echo "  PLATFORM_REPOSITORY (optional): name of the RIFT.ware repository."
-	    echo "  PLATFORM_VERSION (optional): version of the platform packages to be installed."
-	    echo
-	    exit 0;;
-    esac
-fi
-
-
 ###############################################################################
 # Set up repo and version
+PLATFORM_REPOSITORY=OSM
+PLATFORM_VERSION=5.2.0.0.71033
+
+while getopts ":P:V:h" o; do
+    case "${o}" in
+        P)
+            PLATFORM_REPOSITORY=${OPTARG}
+            ;;
+        V)
+            PLATFORM_VERSION=${OPTARG}
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        *)
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+function usage() {
+    echo
+    echo "NAME:"
+    echo "  $0"
+    echo
+    echo "SYNOPSIS:"
+    echo "  $0 -h|--help"
+    echo "  $0 -P <PLATFORM_REPOSITORY> -V <PLATFORM_VERSION>"
+    echo
+    echo "DESCRIPTION:"
+    echo "  Prepare current system to run SO and UI."
+    echo
+    echo "  PLATFORM_REPOSITORY (optional): name of the RIFT.ware repository."
+    echo "  PLATFORM_VERSION (optional): version of the platform packages to be installed."
+    echo
+}
 
-PLATFORM_REPOSITORY=${1:-OSM}
-PLATFORM_VERSION=${2:-4.4.2.1.61839}
 
 ###############################################################################
 # Main block
@@ -76,42 +94,23 @@ 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
-
-
-chmod 777 /usr/rift /usr/rift/usr/share
+/usr/rift/container_tools/mkcontainer --modes MANO-base,rw-platform --rw-version ${PLATFORM_VERSION}
 
 # now disable the RIFT OSM repo so that we'll get MANO from
 # the OSM repos
 rm -f /etc/apt/sources.list.d/RIFT.list
-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 SO UI RO openvim"
+
 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 \
+    rw.core.mano-rwcal-plugin-aws \
+    rw.core.mano-rwcal-plugin-cloudsim \
+    rw.core.mano-rwcal-plugin-cloudsimproxy \
+    rw.core.mano-rwcal-plugin-openmano-vimconnector \
+    rw.core.mano-rwcal-plugin-openstack \
+    rw.core.mano-rwcal-plugin-mock 
+
+
+
+