From c7d2037b8c6293663280a759a2e447d5aef130bd Mon Sep 17 00:00:00 2001 From: Raghavendra Talur Date: Thu, 4 Feb 2016 14:33:54 +0530 Subject: vagrant-tests: Fix bug when git branch name has a / It is possible for a git branch to have a / in it. Source copy from host to VM used relative path on the assumption that VM vagrant dir will always be three levels down the topdir of repo. This assumption breaks when git branch has a / in it. Of the two solutions to fix it: a. Mangle the git branch name to not have a / b. Accomodate the possibility of have a / in git branch name. I have chosen b) because that looks cleaner. Change-Id: I6b71c31da2f5f7c349d6d6882767768b2534d14f BUG: 1291537 Signed-off-by: Raghavendra Talur Reviewed-on: http://review.gluster.org/13355 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- run-tests-in-vagrant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'run-tests-in-vagrant.sh') diff --git a/run-tests-in-vagrant.sh b/run-tests-in-vagrant.sh index cf1bdc8bbf2..f66fae0ac3d 100755 --- a/run-tests-in-vagrant.sh +++ b/run-tests-in-vagrant.sh @@ -100,7 +100,7 @@ echo echo "Copying source code from host machine to VM" cd tests/vagrant/$BRANCHNAME vagrant ssh-config > ssh_config -rsync -az -e "ssh -F ssh_config" --rsync-path="sudo rsync" "../../../." vagrant-testVM:/home/vagrant/glusterfs +rsync -az -e "ssh -F ssh_config" --rsync-path="sudo rsync" "$ORIGIN_DIR/." vagrant-testVM:/home/vagrant/glusterfs if [ $? -eq 0 ] then echo "Copied." -- cgit