[Fusionforge-commits] FusionForge branch Branch_5_2 updated. bfdb20b9fa6c4c4a8ca04744c41f7cfd449c5ed6

Roland Mas lolando at fusionforge.org
Tue Dec 17 17:04:18 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_2 has been updated
       via  bfdb20b9fa6c4c4a8ca04744c41f7cfd449c5ed6 (commit)
      from  8ff07e23c7c323c8d864df640efcabb4b1f0d6c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bfdb20b9fa6c4c4a8ca04744c41f7cfd449c5ed6
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 17:04:10 2013 +0100

    Avoid variable naming conflict

diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 1f3ae13..1f743a7 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -13,15 +13,15 @@ export HOST=$1
 case $HOST in
     debian7.local)
 	export DIST=wheezy
-	VMTEMPLATE=debian7
+	VM=debian7
 	;;
     debian8.local)
 	export DIST=jessie
-	VMTEMPLATE=debian8
+	VM=debian8
 	;;
     *)
 	export DIST=jessie
-	VMTEMPLATE=debian8
+	VM=debian8
 	;;
 esac	
 
@@ -76,8 +76,8 @@ reprepro -Vb $REPOPATH include $DIST $CHANGEFILE
 
 cd $CHECKOUTPATH
 
-destroy_vm -t $VMTEMPLATE $HOST
-start_vm_if_not_keeped -t $VMTEMPLATE $HOST
+destroy_vm -t $VM $HOST
+start_vm_if_not_keeped -t $VM $HOST
 
 cd $CHECKOUTPATH
 # Transfer preseeding
@@ -172,5 +172,5 @@ retcode=$(ssh root@$HOST cat /root/phpunit.exitcode)
 rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 ssh root@$HOST "vncserver -kill :1" || retcode=$?
 
-stop_vm_if_not_keeped -t $VMTEMPLATE $@
+stop_vm_if_not_keeped -t $VM $@
 exit $retcode
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index 1326a77..0ab8b2d 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -7,22 +7,22 @@ export HOST=$1
 case $HOST in
     debian7.local)
 	export DIST=wheezy
-	VMTEMPLATE=debian7
+	VM=debian7
 	;;
     debian8.local)
 	export DIST=jessie
-	VMTEMPLATE=debian8
+	VM=debian8
 	;;
     *)
 	export DIST=jessie
-	VMTEMPLATE=debian8
+	VM=debian8
 	;;
 esac	
 
 get_config $@
 prepare_workspace
-destroy_vm -t $VMTEMPLATE $@
-start_vm_if_not_keeped -t $VMTEMPLATE $@
+destroy_vm -t $VM $@
+start_vm_if_not_keeped -t $VM $@
 
 # Build 3rd-party 
 # make -C 3rd-party -f Makefile.deb BUILDRESULT=$BUILDRESULT LOCALREPODEB=$WORKSPACE/build/debian BUILDDIST=$DIST DEBMIRROR=$DEBMIRROR botclean botbuild
@@ -92,5 +92,5 @@ retcode=$(ssh root@$HOST cat /root/phpunit.exitcode)
 rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 ssh root@$HOST "vncserver -kill :1" || retcode=$?
 
-stop_vm_if_not_keeped -t $VMTEMPLATE $@
+stop_vm_if_not_keeped -t $VM $@
 return $retcode

-----------------------------------------------------------------------

Summary of changes:
 tests/scripts/fusionforge-build-and-test-deb.sh     |   12 ++++++------
 tests/scripts/fusionforge-build-and-test-src-deb.sh |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list