From 8dfd998ac99775c6b58b1862a55a326b876826b7 Mon Sep 17 00:00:00 2001
From: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>
Date: Mon, 2 Oct 2017 20:05:11 -0400
Subject: [PATCH] only remove the packages that this script is about to replace
Signed-off-by: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>
---
jenkins/SO/install | 2 +-
jenkins/UI/install | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
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}
--
GitLab