[Fusionforge-commits] FusionForge branch master updated. 783ab6a2ef0765d062640f61d5f82a37e529bb7c

Roland Mas lolando at fusionforge.org
Fri Oct 10 09:20:50 CEST 2014


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  783ab6a2ef0765d062640f61d5f82a37e529bb7c (commit)
       via  5ff16fd08ee3c1eb0a9ba5b58d3d6b6560539085 (commit)
       via  09ca03bf183438b379e77bd032c01525209e3175 (commit)
      from  924bd3c5963ffab611b69ef3c9f867e462c86a6c (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 783ab6a2ef0765d062640f61d5f82a37e529bb7c
Merge: 924bd3c 5ff16fd
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 10 09:20:20 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc tests/buildbot/config/default
index cc22155,0000000..a1def05
mode 100644,000000..100644
--- a/tests/buildbot/config/default
+++ b/tests/buildbot/config/default
@@@ -1,72 -1,0 +1,72 @@@
 +#
 +# In this file you can find vars that are useable 
 +# both as an include in a Makefile or
 +# be sourced in a shell
 +# So it should only be stuffs like VAR=value
 +#
 +SSHPUBKEY=~/.ssh/id_rsa.pub
 +
 +# Do we keep vm at end of tests
 +KEEPVM=false
 +
 +# VM Engine currently supported lxc, openvz TODO kvm, virtualbox,...
 +VMENGINE=lxc
 +
 +# Web frontend
 +FORGE_ADMIN_USERNAME=admin
 +FORGE_ADMIN_PASSWORD=myadmin
 +FORGE_OTHER_PASSWORD=tototata
 +
 +# Database 
 +DB_NAME=fusionforge
 +DB_USER=forgeuser
 +CONFIGURED=true
 +
 +# Debian mirrors
 +DEBMIRROR=http://cdn.debian.net/debian/
 +DEBMIRRORSEC=http://security.debian.org/
 +
 +# Redhat mirrors
 +#CENTOSMIRROR=http://mirror.bytemark.co.uk/centos/
 +DAG_RPMFORGE_REPO=http://apt.sw.be/redhat
 +EPEL_REPO=http://download.fedoraproject.org/pub/epel
 +
 +# Debian 3rd-party
- DEB3RD=http://buildbot.fusionforge.org/job/3rd-party-deb/ws/build/debian/
++DEB3RD=http://buildbot.fusionforge.org/job/3rd-party-deb-for-5.3/ws/build/debian/
 +
 +# Redhat 3rd-party
- RPM3RD=http://buildbot.fusionforge.org/job/3rd-party-rpm/ws/build/redhat/
++RPM3RD=http://buildbot.fusionforge.org/job/3rd-party-rpm-for-5.3/ws/build/redhat/
 +
 +# The following is for static ip config samples
 +# hostname=vmengine:template:address/mask:gateway
 +# OpenVZ
 +#vzdebian6=openvz:debian6:192.168.222.105/24:192.168.222.1
 +#vzdebian6src=openvz:debian6:192.168.222.120/24:192.168.222.1
 +#vzcentos5=openvz:centos5:192.168.222.110/24:192.168.222.1
 +#vzcentos5src=openvz:centos5:192.168.222.115/24:192.168.222.1
 +
 +# LXC
 +#debian6=lxc:debian6:192.168.222.105/24:192.168.222.1
 +#debian6src=lxc:debian6:192.168.222.120/24:192.168.222.1
 +#centos5=lxc:centos5:192.168.222.110/24:192.168.222.1
 +#centos5src=lxc:centos5:192.168.222.115/24:192.168.222.1
 +
 +# For dhcpconfig
 +#dhdebian6=lxc:debian6::
 +#dhdebian6src=lxc:debian6::
 +#dhcentos5=lxc:centos5::
 +#dhcentos5src=lxc:centos5::
 +
 +# Trunk vm
 +#fgcostrksrc=lxc:centos5::
 +#fgcostrk=lxc:centos5::
 +#fgdebtrk=lxc:debian6::
 +
 +# 5.1 vm
 +#fgcos51src=lxc:centos5::
 +#fgcos51=lxc:centos5::
 +#fgdeb51=lxc:debian6::
 +
 +# Local Variables:
 +# mode: sh
 +# End:

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

Summary of changes:
 tests/buildbot/config/default |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list