installer fixes for R3

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>

diff --git a/jenkins/SO/install b/jenkins/SO/install
index f83f82a..47fcc40 100755 (executable)
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -96,8 +96,6 @@ 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 MANO-base --rw-version ${PLATFORM_VERSION}
 
-chmod 777 /usr/rift /usr/rift/usr/share
-
 # 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

diff --git a/jenkins/UI/SETTINGS b/jenkins/UI/SETTINGS
index 90ca554..7c04f11 100644 (file)
--- a/jenkins/UI/SETTINGS
+++ b/jenkins/UI/SETTINGS
@@ -29,7 +29,7 @@ export OSM_BUILD_CONTAINER=UI-ub
 #
 # this variable holds the name of the container to be used to run a package
 # if this container already exists, the run processes can skip the container build
-export OSM_RUNTIME_CONTAINER=UI-ub
+export OSM_RUNTIME_CONTAINER=SO-ub
 #
 # this variable must be set to allow creating the runtime container in privileged mode
 # this variable should be removed in the future when no privileged mode is required

diff --git a/jenkins/UI/install b/jenkins/UI/install
index 7129617..c8c5be1 100755 (executable)
--- a/jenkins/UI/install
+++ b/jenkins/UI/install
@@ -98,7 +98,6 @@ 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 UI-base --rw-version ${PLATFORM_VERSION}
 
-chmod 777 /usr/rift /usr/rift/usr/share
 
 # now disable the RIFT OSM repo so that we'll get UI from
 # the OSM repos