X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2FSO%2Finstall;h=2adc9492a6f6ca6d79d4fa2d9454f7300cf5bb23;hb=a4e08139159ec7d378764c25d63e9a888fda7dfa;hp=f83f82aba84d16c58ed966672ae4feb3de8b024d;hpb=f22daee546d0aaf6d52b628595735950f02ee994;p=osm%2Fdevops.git

diff --git a/jenkins/SO/install b/jenkins/SO/install
index f83f82ab..2adc9492 100755
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -80,7 +80,7 @@ function usage() {
 
 # enable the right repos
 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}/
+curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
 
 # Make the Rift repo a higher priority to work around version conflicts.
 cat <<EOF > /etc/apt/preferences.d/rift
@@ -89,29 +89,51 @@ 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-version ${PLATFORM_VERSION}
-
-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
+rm -f /etc/apt/sources.list.d/rift.list
 
 apt-get update
 
 apt-get install -y \
-    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 
+    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