[Fusionforge-commits] FusionForge branch master updated. 7df2d72616bd173937a2c03b3dc8c64f950b6ff7

Roland Mas lolando at fusionforge.org
Tue Dec 17 17:24:47 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, master has been updated
       via  7df2d72616bd173937a2c03b3dc8c64f950b6ff7 (commit)
       via  13e4e1aa82f3f7ac34ad598f8f821bbeda4fa894 (commit)
       via  bfdb20b9fa6c4c4a8ca04744c41f7cfd449c5ed6 (commit)
      from  7c574a73a4cd7a1805ea22efe2c2e63ddfbf617f (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 7df2d72616bd173937a2c03b3dc8c64f950b6ff7
Merge: 7c574a7 13e4e1a
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 17:24:33 2013 +0100

    Merged from 5.2: Allow switching distro for buildbot

diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index 36ebcc9,1f743a7..f5d3872
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -80,21 -74,14 +80,21 @@@ EO
  
  reprepro -Vb $REPOPATH include $DIST $CHANGEFILE
  
 +rm ${BUILDPLACE}/${PKGNAME}_${SMAJOR}${MINOR}*
 +rm -rf $BUILDPLACE/$PKGNAME-$MAJOR
 +
 +cd $BUILDRESULT
 +cat $CHANGEFILE | sed '1,/^Checksums-Sha1:/d;/^[[:alnum:]]/,$d' | awk '{print $3}' | xargs rm
 +rm $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
 +setup_debian_3rdparty_repo
  
 -cd $CHECKOUTPATH
  # Transfer preseeding
 -# cat tests/preseed/* | sed s/@FORGE_ADMIN_PASSWORD@/$FORGE_ADMIN_PASSWORD/ | ssh root@$HOST "LANG=C debconf-set-selections"
 +cat tests/preseed/* | sed s/@FORGE_ADMIN_PASSWORD@/$FORGE_ADMIN_PASSWORD/ | ssh root@$HOST "LANG=C debconf-set-selections"
  
  # Setup debian repo
  export DEBMIRROR DEBMIRRORSEC
@@@ -155,9 -135,42 +155,9 @@@ EO
  # Run tests
  retcode=0
  echo "Run phpunit test on $HOST in $FORGE_HOME"
 -
 -ssh root@$HOST "apt-get -y install xfonts-base vnc4server ; mkdir -p /root/.vnc"
 -ssh root@$HOST "cat > /root/.vnc/xstartup ; chmod +x /root/.vnc/xstartup" <<EOF
 -#! /bin/bash
 -# Setup ssh key and parameters
 -cd
 -mkdir -p .ssh
 -if ! [ -e .ssh/id_rsa.pub ] ; then
 -    ssh-keygen -f .ssh/id_rsa -N ''
 -    cat .ssh/id_rsa.pub >> .ssh/authorized_keys
 -fi
 -if ! grep -q StrictHostKeyChecking .ssh/config ; then
 -    echo StrictHostKeyChecking no >> .ssh/config
 -fi
 -
 -[ -e /var/lib/gforge/.bazaar/bazaar.conf ] && sed -i -e s,https://,http://,g /var/lib/gforge/.bazaar/bazaar.conf
 -
 -: > /root/phpunit.exitcode
 -$FORGE_HOME/tests/scripts/phpunit.sh DEBDebian70Tests.php &> /var/log/phpunit.log &
 -echo \$! > /root/phpunit.pid
 -wait %1
 -echo \$? > /root/phpunit.exitcode
 -EOF
 -ssh root@$HOST vncpasswd <<EOF
 -password
 -password
 -EOF
 -
 -ssh root@$HOST "vncserver :1"
 -sleep 5
 -pid=$(ssh root@$HOST cat /root/phpunit.pid)
 -ssh root@$HOST "tail -f /var/log/phpunit.log --pid=$pid"
 -sleep 5
 -retcode=$(ssh root@$HOST cat /root/phpunit.exitcode)
 +ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER"
 +retcode=$?
  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 --cc tests/scripts/fusionforge-build-and-test-src-deb.sh
index 17f0aab,0ab8b2d..b52f809
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@@ -19,14 -19,21 +19,14 @@@ case $HOST i
  	;;
  esac	
  
 +export FILTER="DEBDebian70TestsSRC.php"
 +
  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
 -
 -# Setup debian repo
 -# ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
 -# ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"
 -# ssh root@$HOST "echo \"deb file:/debian $DIST main\" >> /etc/apt/sources.list"
 -# scp -r $WORKSPACE/build/debian root@$HOST:/
 -# gpg --export --armor | ssh root@$HOST "apt-key add -"
 -# sleep 5
 +setup_debian_3rdparty_repo
  
  ssh root@$HOST "apt-get update"
  
@@@ -62,10 -68,29 +62,10 @@@ EO
  
  # Run tests
  retcode=0
 -echo "Run phpunit test on $HOST"
 -
 -ssh root@$HOST "apt-get -y install xfonts-base vnc4server ; mkdir -p /root/.vnc"
 -ssh root@$HOST "cat > /root/.vnc/xstartup ; chmod +x /root/.vnc/xstartup" <<EOF
 -#! /bin/bash
 -: > /root/phpunit.exitcode
 -$FORGE_HOME/tests/scripts/phpunit.sh DEBDebian70Tests.php &> /var/log/phpunit.log &
 -echo \$! > /root/phpunit.pid
 -wait %1
 -echo \$? > /root/phpunit.exitcode
 -EOF
 -ssh root@$HOST vncpasswd <<EOF
 -password
 -password
 -EOF
 -ssh root@$HOST "vncserver :1"
 -sleep 5
 -pid=$(ssh root@$HOST cat /root/phpunit.pid)
 -ssh root@$HOST "tail -f /var/log/phpunit.log --pid=$pid"
 -sleep 5
 -retcode=$(ssh root@$HOST cat /root/phpunit.exitcode)
 +echo "Run phpunit test on $HOST in $FORGE_HOME"
 +ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER"
 +retcode=$?
  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
 +exit $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