[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 8ff07e23c7c323c8d864df640efcabb4b1f0d6c8

Roland Mas lolando at fusionforge.org
Tue Dec 17 16:56:37 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  8ff07e23c7c323c8d864df640efcabb4b1f0d6c8 (commit)
      from  4433dc0e3ec6bf074b252aa1a1a32128d5883d0b (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 8ff07e23c7c323c8d864df640efcabb4b1f0d6c8
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 16:56:30 2013 +0100

    Allow switching distro for buildbot

diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index 9efbfe8..1326a77 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -3,11 +3,26 @@
 . tests/scripts/common-vm
 
 export FORGE_HOME=/opt/gforge
-export DIST=wheezy
+export HOST=$1
+case $HOST in
+    debian7.local)
+	export DIST=wheezy
+	VMTEMPLATE=debian7
+	;;
+    debian8.local)
+	export DIST=jessie
+	VMTEMPLATE=debian8
+	;;
+    *)
+	export DIST=jessie
+	VMTEMPLATE=debian8
+	;;
+esac	
+
 get_config $@
 prepare_workspace
-destroy_vm -t debian7 $@
-start_vm_if_not_keeped -t debian7 $@
+destroy_vm -t $VMTEMPLATE $@
+start_vm_if_not_keeped -t $VMTEMPLATE $@
 
 # Build 3rd-party 
 # make -C 3rd-party -f Makefile.deb BUILDRESULT=$BUILDRESULT LOCALREPODEB=$WORKSPACE/build/debian BUILDDIST=$DIST DEBMIRROR=$DEBMIRROR botclean botbuild
@@ -77,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 debian7 $@
+stop_vm_if_not_keeped -t $VMTEMPLATE $@
 return $retcode

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

Summary of changes:
 .../scripts/fusionforge-build-and-test-src-deb.sh  |   23 ++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list