X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=BUILD.sh;h=788f9d140323c227344b41feb4fbf23c721aa894;hb=8b17d18c5c0c1efb4b4f0eea2f8ad9b4c438780d;hp=4d9f36a882f3c2f1963241217b1030c7ccfdd1bb;hpb=d748ab1836d94ebe1273b1910954be3b2a2b4486;p=osm%2FSO.git

diff --git a/BUILD.sh b/BUILD.sh
index 4d9f36a8..788f9d14 100755
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -114,10 +114,10 @@ fi
 
 if [[ $PLATFORM == ub16 ]]; then
     PLATFORM_REPOSITORY=${1:-OSM}
-    PLATFORM_VERSION=${2:-4.3.1.0.50309}
+    PLATFORM_VERSION=${2:-4.3.1.0.53704}
 elif [[ $PLATFORM == fc20 ]]; then
     PLATFORM_REPOSITORY=${1:-OSM}  # change to OSM when published
-    PLATFORM_VERSION=${2:-4.3.1.0.50310}
+    PLATFORM_VERSION=${2:-4.3.1.0.53705}
 else
     echo "Internal error: unknown platform $PLATFORM"
     exit 1
@@ -126,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)
 
@@ -136,12 +147,15 @@ test -h /usr/rift && sudo rm -f /usr/rift
 if [[ $PLATFORM == ub16 ]]; then
     # enable the right repos
     curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add -
+    # the old mkcontainer always enabled release which can be bad
+    # so remove it
+    sudo rm -f /etc/apt/sources.list.d/release
     sudo curl -o /etc/apt/sources.list.d/${PLATFORM_REPOSITORY}.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/ 
     sudo apt-get update
         
     # and install the tools
     sudo apt remove -y rw.toolchain-rwbase tcpdump
-    sudo apt-get install -y rw.tools-container-tools rw.tools-scripts python 
+    sudo apt-get install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION} python 
 elif [[ $PLATFORM == fc20 ]]; then
     # get the container tools from the correct repository
     sudo rm -f /etc/yum.repos.d/private.repo
@@ -160,6 +174,7 @@ fi
 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}
+    sudo pip3 install lxml==3.4.0
 fi
 
 
@@ -173,6 +188,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