X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=BUILD.sh;h=0443cc4c5d18a8bd95b88aeec118966b458fac36;hb=30ee9b98b1255edd5ed79a31332b6dabbddb5823;hp=222ccad45c1aa23e2faf60e41e385dc49640df91;hpb=49868d2c71eb364cee9707515be6841a568dad40;p=osm%2FSO.git

diff --git a/BUILD.sh b/BUILD.sh
index 222ccad4..0443cc4c 100755
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -95,9 +95,14 @@ set -x             # Print commands before executing them
 
 ###############################################################################
 # Find the platform
-if python -mplatform | grep -qi fedora; then
+PYTHON=python
+if [[ ! -f /usr/bin/python ]]; then
+  PYTHON=python3
+fi
+
+if $PYTHON -mplatform | grep -qi fedora; then
     PLATFORM=fc20
-elif python -mplatform | grep -qi ubuntu; then
+elif $PYTHON -mplatform | grep -qi ubuntu; then
     PLATFORM=ub16
 else
     echo "Unknown platform"
@@ -109,10 +114,10 @@ fi
 
 if [[ $PLATFORM == ub16 ]]; then
     PLATFORM_REPOSITORY=${1:-OSM}
-    PLATFORM_VERSION=${2:-4.3.1.0.49556}
+    PLATFORM_VERSION=${2:-4.3.1.0.50309}
 elif [[ $PLATFORM == fc20 ]]; then
     PLATFORM_REPOSITORY=${1:-OSM}  # change to OSM when published
-    PLATFORM_VERSION=${2:-4.3.1.0.49553-1}
+    PLATFORM_VERSION=${2:-4.3.1.0.50310}
 else
     echo "Internal error: unknown platform $PLATFORM"
     exit 1
@@ -121,6 +126,17 @@ fi
 ###############################################################################
 # Main block
 
+# Disable apt-daily.service and apt-daily.timer
+
+DAILY_TIMER='apt-daily.timer'
+DAILY_SERVICE='apt-daily.service'
+if [ $(systemctl is-active $DAILY_TIMER) = "active" ]
+then
+    systemctl stop $DAILY_TIMER
+    systemctl disable $DAILY_TIMER
+    systemctl disable $DAILY_SERVICE
+fi
+
 # must be run from the top of a workspace
 cd $(dirname $0)
 
@@ -153,13 +169,14 @@ fi
 # and install of the packages required to build and run
 # this module
 if $runMkcontainer; then
+    sudo apt-get install -y libxml2-dev libxslt-dev
     sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY}
 fi
 
 
 if [[ $PLATFORM == ub16 ]]; then
     # install the RIFT platform code:
-    sudo apt-get install -y rw.toolchain-rwbase=${PLATFORM_VERSION} \
+    sudo apt-get install -y --allow-downgrades rw.toolchain-rwbase=${PLATFORM_VERSION} \
 	 rw.toolchain-rwtoolchain=${PLATFORM_VERSION} \
 	 rw.core.mgmt-mgmt=${PLATFORM_VERSION} \
 	 rw.core.util-util=${PLATFORM_VERSION} \
@@ -167,6 +184,8 @@ if [[ $PLATFORM == ub16 ]]; then
 	 rw.core.rwvx-rwdts=${PLATFORM_VERSION} \
 	 rw.automation.core-RWAUTO=${PLATFORM_VERSION} \
          rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION}
+
+    sudo apt-get install python-cinderclient
     
     sudo chmod 777 /usr/rift /usr/rift/usr/share
     
@@ -264,8 +283,6 @@ if [[ $UIPathToBuild ]]; then
     sudo make -C $UIPathToBuild install
 fi
 
-echo "To run SO with UI please run:"
-echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode'
-echo
-echo "To run SO without UI please run:"
-echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode --no-ui'
+echo "Creating Service ...."
+sudo $(dirname $0)/create_launchpad_service
+