From: Junaid Ali <junaidali.yahya@gmail.com>
Date: Tue, 10 Jul 2018 14:39:50 +0000 (+0100)
Subject: [salt.sh] Ignoring files using rsync
X-Git-Tag: opnfv-7.0.0~140
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F59653%2F4;hp=bd267864cf74da908379dedc378600501149477d;p=fuel.git

[salt.sh] Ignoring files using rsync

  Currently rsync is not ignoring '.gitignore' file due to the
  specification of absolute path. This patch fixes the issue and
  also ignores the temporary directory if that is created inside
  the cloned fuel repo

  PatchSet2: Shell check
  PatchSet3: Minor improvements
  PatchSet4: Rebasing the commit

Change-Id: I05fc39236af1bc6f8eabb668304ba5a32dec0737
Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
---

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 4a20bc413..dc2226e34 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -29,8 +29,14 @@ NODE_MASK="${LOCAL_VIRT_NODES// /|}"
 # push to cfg01 current git repo first (including submodules), at ~ubuntu/opnfv
 # later we move it to ~root/opnfv (and ln as ~root/fuel); delete the temp clone
 remote_tmp="${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")"
+STORAGE_DIR=$(dirname "${LOCAL_PDF_RECLASS}")
+REL_STORAGE_DIR_PATH=${STORAGE_DIR#${LOCAL_GIT_DIR}}
+if [[ "${REL_STORAGE_DIR_PATH}" == "${STORAGE_DIR}" ]]
+then
+  REL_STORAGE_DIR_PATH=""
+fi
 rsync -Erl --delete -e "ssh ${SSH_OPTS}" \
-  --exclude-from="${F_GIT_ROOT}/.gitignore" \
+  --exclude={.gitignore,"$REL_STORAGE_DIR_PATH"} \
   "${LOCAL_GIT_DIR}/" "${remote_tmp}/"
 if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then
   rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \