From 1c0c34ba9d178ca647b6642a7990b742ea4ccbb1 Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Tue, 7 Apr 2020 16:50:52 -0400 Subject: [PATCH] Modify the verify script for LF build minions. Signed-off-by: Zhe Huang Change-Id: I51ce171145c90f3ba3fe43e009640651e3ae1307 --- bin/verify-ric-charts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts index 6cadf7c..7400185 100755 --- a/bin/verify-ric-charts +++ b/bin/verify-ric-charts @@ -34,7 +34,7 @@ if [[ "${2:-nope}" != "nope" ]]; then OVERRIDEYAML=$2 fi -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" +ROOT_DIR="$(pwd)" HELM_COMMAND=helm if ! $($HELM_COMMAND > /dev/null);then @@ -52,10 +52,9 @@ fi git clone --single-branch --branch master "https://gerrit.o-ran-sc.org/r/it/dep" ./dep # Start Helm local repo if there isn't one -HELM_PID=$(pgrep "$HELM_COMMAND") -if [ ! -z "$HELM_PID" ]; then +if [ ! -z $(pgrep "$HELM_COMMAND") ]; then echo "Stopping existing local Helm server." - kill -9 "$HELM_PID" + kill -9 "$(pgrep "$HELM_COMMAND")" fi if [ ! -d ./charts ]; then mkdir ./charts -- 2.16.6