From: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>
Date: Tue, 3 Oct 2017 00:05:11 +0000 (-0400)
Subject: only remove the packages that this script is about to replace
X-Git-Tag: v3.0.0rc2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8dfd998ac99775c6b58b1862a55a326b876826b7;p=osm%2Fdevops.git

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 59cfae1d..65fe4b1d 100755
--- 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 c145a537..ddf07349 100755
--- 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}