summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-07-04 18:02:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-04 18:02:48 +0000
commit25974adfe75c75c79d6586fddba5c3e379fd741e (patch)
tree1858d3b44f4f793663b735f1d266ba1bb3e3d537
parent8ffb5e97c5303fb74cf96c64434642ac016afc21 (diff)
parent68412ffc734e9e34b0e4b9209bdd7b4222b2003d (diff)
Merge "prototypes: xci: xci-deploy.sh: Append trailing slash for rsync vars"
-rwxr-xr-xprototypes/xci/xci-deploy.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 3a65983ac..a72c9274a 100755
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -38,6 +38,15 @@ source "$XCI_PATH/config/${XCI_FLAVOR}-vars"
source $XCI_PATH/config/env-vars
#-------------------------------------------------------------------------------
+# Sanitize local development environment variables
+#-------------------------------------------------------------------------------
+user_local_dev_vars=(OPNFV_RELENG_DEV_PATH OPNFV_OSA_DEV_PATH OPNFV_BIFROST_DEV_PATH)
+for local_user_var in ${user_local_dev_vars[@]}; do
+ [[ -n ${!local_user_var} ]] && export $local_user_var=${!local_user_var%/}/
+done
+unset user_local_dev_vars local_user_var
+
+#-------------------------------------------------------------------------------
# Log info to console
#-------------------------------------------------------------------------------
echo "Info: Starting XCI Deployment"