From 9a0c181e98b0f851f475b16e6dbd7a5e1f469f97 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 26 Mar 2020 20:42:14 -0400 Subject: [PATCH] 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) Change-Id: Iab04fcabaded628938f0a8685218d04f9a483bed --- jjb/shell/install-deb-nng-rmr.sh | 1 + jjb/shell/install-deb-rmr3.sh | 1 + jjb/shell/install-rpm-nng-rmr.sh | 1 + jjb/shell/install-rpm-rmr3.sh | 5 +++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jjb/shell/install-deb-nng-rmr.sh b/jjb/shell/install-deb-nng-rmr.sh index c3cd175a..8b472c03 100644 --- 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 ef9e7e91..5749495c 100644 --- 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 61baea90..20ee27c0 100644 --- 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 3970f1fe..cb74bea8 100644 --- 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" -- 2.16.6