X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fshell%2Finstall-rpm-rmr3.sh;h=3970f1fee6913016b0b50a1b815b46792c774246;hb=ac914993447938b9c58d6470a33a44696581248f;hp=7406c03d5d9c27f9f261425300f3723d3d3fac30;hpb=95cc0897e3ee30c58d2f8ea099d6e8ba68e8bc0f;p=ci-management.git

diff --git a/jjb/shell/install-rpm-rmr3.sh b/jjb/shell/install-rpm-rmr3.sh
index 7406c03d..3970f1fe 100644
--- a/jjb/shell/install-rpm-rmr3.sh
+++ b/jjb/shell/install-rpm-rmr3.sh
@@ -17,18 +17,20 @@
 # limitations under the License.
 
 # Installs RMR ver 3.x headers and shared-object libraries 
-# from PackageCloud on a CentOS
-# Reads RMR version number from repo file rmr-version.yaml
-# Does NOT install or assume NNG
+# from PackageCloud on a CentOS; does NOT install or assume NNG.
+# Reads RMR version number from repo file rmr-version.yaml like this:
+#   ---
+#   repo: staging             (this entry is optional)
+#   version: 3.6.1            (this entry is required)
 
 echo "---> install-rpm-rmr3.sh"
-
 # stop on error or unbound var, and be chatty
 set -eux
 
 version_file=rmr-version.yaml
 if [[ -f $version_file ]]; then
     # pipeline is less elegant than yq but that requires venv and pip install
+    repo=$(grep "^repo:" "$version_file" | cut -d: -f2 | xargs )
     ver=$(grep "^version:" "$version_file" | cut -d: -f2 | xargs )
 else
     echo "File $version_file not found."
@@ -37,15 +39,12 @@ fi
 if [[ -z $ver ]]; then
     echo "Failed to get RMR version string from file $version_file"
     exit 1
-else
-    echo "RMR version string is ${ver}"
 fi
-
-# TODO use release repo, not staging
+# default to release repo; accept override to use staging repo
+repo=${repo:-"release"}
 # RPM packager adds suffix "-1" to version
-repo=staging
 for rpm in "rmr-${ver}-1.x86_64.rpm" "rmr-devel-${ver}-1.x86_64.rpm"; do
-    wget -q --content-disposition https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm
+    wget -nv --content-disposition https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm
     sudo rpm -iv ${rpm}
 done