X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jenkins%2FSO%2Finstall;h=e96beab7b8e5bb2214e6d0e41f7623247880c843;hb=4e6025067d0da053fccd47b532b3022d0795bed8;hp=59cfae1d6a21813922e558f7be10d1f5de8ba4bc;hpb=2b22e63a1ce60d7c62535eece0e62280b1e00445;p=osm%2Fdevops.git

diff --git a/jenkins/SO/install b/jenkins/SO/install
index 59cfae1d..e96beab7 100755
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -35,7 +35,7 @@ set -o nounset    # Expanding an unset variable is an error.  Variables must be
 
 ###############################################################################
 # Set up repo and version
-PLATFORM_REPOSITORY=OSM
+PLATFORM_REPOSITORY=OSM3
 PLATFORM_VERSION=5.2.0.0.71033
 
 while getopts ":P:V:h" o; do
@@ -79,6 +79,8 @@ function usage() {
 # Main block
 
 # enable the right repos
+echo "### INSTALLING RIFT platform ${PLATFORM_VERSION} from repository ${PLATFORM_REPOSITORY}"
+
 curl http://repos.riftio.com/public/xenial-riftware-public-key | apt-key add -
 curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
 
@@ -89,10 +91,34 @@ Pin: origin repos.riftio.com
 Pin-Priority: 600
 EOF
 
+
+
+#######################
+# temp fix
+# this is normally done by mkcontainer, but the last line is missing
+# we can take this out when we update the RIFT platform
+
+cat <<EOF >>/etc/systemd/user.conf
+DefaultLimitNOFILE=65536
+DefaultLimitMSGQUEUE=8192000
+DefaultLimitNPROC=65536
+DefaultTasksMax=65536
+EOF
+cat <<EOF >>/etc/systemd/system.conf
+DefaultLimitNOFILE=65536
+DefaultLimitMSGQUEUE=8192000
+DefaultLimitNPROC=65536
+DefaultTasksMax=65536
+EOF
+systemctl daemon-reload
+
+##################################
+
+
 apt-get update
 
 # and install the tools
-apt remove -y rw.toolchain-rwbase tcpdump
+apt remove -y 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 MANO-base,rw-platform --rw-version ${PLATFORM_VERSION}
 
@@ -109,8 +135,9 @@ apt-get install -y \
     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 
-
-
+    rw.core.mano-rwcal-plugin-mock
 
+# Install libjuju
+apt-get install -y python3-pip
 
+pip3 install juju