only remove the packages that this script is about to replace

Signed-off-by: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>

diff --git a/jenkins/SO/install b/jenkins/SO/install
index 59cfae1..65fe4b1 100755 (executable)
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -92,7 +92,7 @@ EOF
 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}
 

diff --git a/jenkins/UI/install b/jenkins/UI/install
index c145a53..ddf0734 100755 (executable)
--- a/jenkins/UI/install
+++ b/jenkins/UI/install
@@ -94,7 +94,6 @@ EOF
 apt-get update
 
 # and install the tools
-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}