From 1d36ae1a77dda5c6ae85206112964a1bbb2066e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 25 Jul 2019 16:12:31 +0200 Subject: [PATCH] [seba] Fix compat with older git client CentOS ships with an older version of `git`, which lacks certain features like updating submodules from a CWD different from git repo root. Work around these to avoid compatibility issues. Change-Id: Ibba156e7fb7edb41215f4be3893a3c1cc5d956d8 Signed-off-by: Alexandru Avadanii --- src/use_cases/seba_on_arm/install/install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/use_cases/seba_on_arm/install/install.sh b/src/use_cases/seba_on_arm/install/install.sh index eb9fbc1..b28d492 100755 --- a/src/use_cases/seba_on_arm/install/install.sh +++ b/src/use_cases/seba_on_arm/install/install.sh @@ -12,6 +12,7 @@ CORD_CHART=${CORD_CHART:-${basepath}/../src_repo/seba_charts} # TODO(alav): Make each step re-entrant +# shellcheck source=/dev/null source util.sh wait_for 10 'test $(kubectl get pods --all-namespaces | grep -ce "tiller.*Running") -eq 1' @@ -19,9 +20,11 @@ wait_for 10 'test $(kubectl get pods --all-namespaces | grep -ce "tiller.*Runnin # Add the CORD repository and update indexes if [ "$(uname -m)" == "aarch64" ]; then - if [ ! -d ${CORD_CHART}/cord-platform ]; then + if [ ! -d "${CORD_CHART}/cord-platform" ]; then #git clone https://github.com/iecedge/seba_charts ${CORD_CHART} - cd ${basepath}/../src_repo && git submodule update --init seba_charts + cd "$(git rev-parse --show-toplevel)" + git submodule update --init "${CORD_CHART}" + cd "${basepath}/../src_repo" fi else helm repo add cord "${CORD_REPO}" -- 2.16.6