Adjust installer scripts to remove .deb/.rpm files

The installer scripts left .deb/.rpm files lying around
which can confuse later steps.

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: Iab04fcabaded628938f0a8685218d04f9a483bed

diff --git a/jjb/shell/install-deb-nng-rmr.sh b/jjb/shell/install-deb-nng-rmr.sh
index c3cd175..8b472c0 100644 (file)
--- a/jjb/shell/install-deb-nng-rmr.sh
+++ b/jjb/shell/install-deb-nng-rmr.sh
@@ -65,5 +65,6 @@ echo "Download RMR library ${ver} as file ${deb}"
 wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/${deb}/download.deb
 echo "Install RMR library file ${deb}"
 sudo dpkg -i ${deb}
+rm -f ${deb}
 
 echo "---> install-deb-nng-rmr.sh ends"

diff --git a/jjb/shell/install-deb-rmr3.sh b/jjb/shell/install-deb-rmr3.sh
index ef9e7e9..5749495 100644 (file)
--- a/jjb/shell/install-deb-rmr3.sh
+++ b/jjb/shell/install-deb-rmr3.sh
@@ -46,6 +46,7 @@ repo=${repo:-"release"}
 for deb in "rmr_${ver}_amd64.deb" "rmr-dev_${ver}_amd64.deb"; do
     wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/debian/stretch/${deb}/download.deb"
     sudo dpkg -i "${deb}"
+    rm -f "${deb}"
 done
 
 echo "---> install-deb-rmr3.sh ends"

diff --git a/jjb/shell/install-rpm-nng-rmr.sh b/jjb/shell/install-rpm-nng-rmr.sh
index 61baea9..20ee27c 100644 (file)
--- a/jjb/shell/install-rpm-nng-rmr.sh
+++ b/jjb/shell/install-rpm-nng-rmr.sh
@@ -65,5 +65,6 @@ echo "Download RMR library ${ver} as file ${rpm}"
 wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/el/5/${rpm}/download.rpm
 echo "Install RMR library file ${rpm}"
 sudo rpm -iv ${rpm}
+rm -f ${rpm}
 
 echo "---> install-rpm-nng-rmr.sh ends"

diff --git a/jjb/shell/install-rpm-rmr3.sh b/jjb/shell/install-rpm-rmr3.sh
index 3970f1f..cb74bea 100644 (file)
--- a/jjb/shell/install-rpm-rmr3.sh
+++ b/jjb/shell/install-rpm-rmr3.sh
@@ -44,8 +44,9 @@ fi
 repo=${repo:-"release"}
 # RPM packager adds suffix "-1" to version
 for rpm in "rmr-${ver}-1.x86_64.rpm" "rmr-devel-${ver}-1.x86_64.rpm"; do
-    wget -nv --content-disposition https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm
-    sudo rpm -iv ${rpm}
+    wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm"
+    sudo rpm -iv "${rpm}"
+    rm -f "${rpm}"
 done
 
 echo "---> install-rpm-rmr3.sh ends"