[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. a8dc4e256ca9040c17510c30dda2794c8a4af700

Roland Mas lolando at fusionforge.org
Thu Dec 18 12:31:40 CET 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, feature/concurrent-ssh-http-for-scm has been updated
       via  a8dc4e256ca9040c17510c30dda2794c8a4af700 (commit)
      from  83c630008e42fb32bfa1e66f458248d4b013cc78 (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 a8dc4e256ca9040c17510c30dda2794c8a4af700
Author: Roland Mas <lolando at debian.org>
Date:   Thu Dec 18 12:15:34 2014 +0100

    Removed obsolete files

diff --git a/src/install/deps b/src/install/deps
deleted file mode 100644
index cf76489..0000000
--- a/src/install/deps
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /bin/sh
-# FusionForge Installation Dependency Setup
-#
-# Copyright 2006 GForge, LLC
-# Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
-# Copyright (C) 2011 Christian Bayle
-# Copyright 2013-2014, Franck Villaume - TrivialDev
-# http://fusionforge.org/
-#
-# @version
-#
-# highly inspired from GInstaller
-#
-# FusionForge is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# FusionForge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with FusionForge; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-msg(){
-	GREEN=""
-	NORMAL=""
-	RED=""
-	case $1 in
-		red)
-			echo "$RED $2 $NORMAL"
-			;;
-		green)
-			echo "$GREEN $2 $NORMAL"
-			;;
-	esac
-}
-
-
-deps_redhat() {
-	if [ ! -f /tmp/done_yum ]
-	then
-		addFusionForgeYumRepo
-		addDagRPMForgeYumRepo
-		msg green "Installing packages: Executing YUM. Please wait..."
-		case $(yum info postgresql | awk '/^Version/ {print $3}') in
-		    7.*|8.0*|8.1*|8.2*)
-			pg=postgresql84
-			;;
-		    *)
-			pg=postgresql
-		esac
-		case $targetversion in
-			6|el6*)
-				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pear-HTTP_WebDAV_Server antiword shared-mime-info rsync git gitweb"
-				;;
-			5|el5*)
-				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pecl-zip php-pear-HTTP_WebDAV_Server antiword php-pecl-Fileinfo shared-mime-info rsync git gitweb"
-				;;
-			*)
-				msg red "Target version unknown. Die here"
-				exit 1
-				;;
-		esac
-		yum --enablerepo=fusionforge --enablerepo=dag-rpmforge -y --skip-broken install $packagelist
-		touch /tmp/done_yum
-	fi
-}
-
-deps_debian() {
-	msg green "Installing packages: Executing apt-get. Please wait..."
-	DEBIAN_FRONTEND=noninteractive
-	export DEBIAN_FRONTEND
-	apt-get -y update
-	apt-get -y --force-yes install apache2 libapache2-mod-php5 php5 php5-cli php5-pgsql cvs postgresql postgresql-contrib php5-curl curl ssh lsb-release php5-cli php-htmlpurifier
-	apt-get -y --force-yes install libipc-run-perl liburi-perl
-	apt-get -y --force-yes install subversion subversion-tools # libapache2-svn
-	apt-get -y --force-yes install python-moinmoin python-psycopg2 python-pygments libapache2-mod-wsgi
-	apt-get -y --force-yes install mediawiki
-	apt-get -y --force-yes install git gitweb
-	apt-get -y --force-yes install libapache2-mpm-itk
-	a2enmod headers
-	a2enmod proxy
-	a2enmod ssl
-	a2enmod rewrite
-	a2enmod vhost_alias
-	a2enmod access_compat
-	a2enmod alias
-	a2enmod dir
-	a2enmod authn_core
-	a2enmod wsgi
-	a2enmod cgi
-	# TODO: automate next
-	msg red "You Must Install Mailman Manually: apt-get install mailman postfix"
-}
-
-# http://www.arklinux.org/
-deps_ark() {
-	msg green "Installing packages: Executing apt-get. Please wait..."
-	apt-get update
-	apt-get -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion subversion-server-httpd postfix rcs mod_ssl wget ssh git gitweb
-
-	msg green "Restarting PostgreSQL"
-	/sbin/service postgresql restart
-
-	# TODO: automate next
-	msg red "You Must Install htmlpurifier manually."
-}
-
-deps_suse() {
-	msg green "Installing Packages with yast"
-	yast -i php5 apache2-prefork php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php4-pgsql subversion apache-mod_dav_svn ssh postfix rcs php4-gd mod_ssl perl-IPC-Run php4-curl wget subversion-server apache2-mod_php4 git gitweb
-
-	msg green "Fixing php4 installation"
-	cp /usr/lib/apache2-prefork/libphp4.so /usr/lib/apache2/mod_php.so
-
-	msg green "Stopping Apache"
-	/etc/init.d/apache2 stop
-
-	msg green "Restarting PostgreSQL"
-	/etc/init.d/postgresql stop
-	/etc/init.d/postgresql start
-
-	msg green "Starting Apache"
-	/etc/init.d/apache2 start
-
-	# TODO: automate next
-	msg red "You Must Install htmlpurifier manually."
-
-}
-
-deps_opensuse() {
-	msg green "Installing Packages with yast"
-	# check for newer suse
-	release=`awk '{print $2}' /etc/SuSE-release | head -n 1`
-        if [ $release = "13.1" ]; then
-		modules="php5 apache2-prefork apache2-mod_php5 cvs mailman perl-IPC-Run perl-URI php5-curl php5-gd php5-gettext php5-pgsql postfix postgresql92 postgresql-libs postgresql92-server postgresql92-contrib rcs openssh subversion subversion-server wget viewvc git git-web"
-	else
-		modules="php5 apache2-prefork apache2-mod_php5 cvs mailman perl-IPC-Run perl-URI php5 php5-curl php5-gd php5-gettext php5-pgsql postfix postgresql postgresql-contrib postgresql-libs postgresql-server rcs openssh subversion subversion-server wget viewvc git gitweb"
-	fi
-	yast -i ${modules}
-
-	msg green "Restarting PostgreSQL..."
-	rcpostgresql restart
-	msg green "Restarting Apache..."
-	rcapache2 restart
-
-	if [ $release = "13.1" ]; then
-		msg green "Installing htmlpurifier with pear"
-		pear channel-discover htmlpurifier.org
-		pear install hp/HTMLPurifier
-
-		# make symlinks to meet standards
-		ln -s /usr/share/php5/PEAR /usr/share/pear
-		ln -s /usr/share/php5 /usr/share/php
-	else
-		# TODO: automate next
-		msg red "You Must Install htmlpurifier manually."
-	fi
-}
-
-addFusionForgeYumRepo() {
-	if [ ! -f "/etc/yum.repos.d/fusionforge.repo" ]
-	then 
-		msg green "Adding Fusionforge YUM repository"
-		if [ -z "$FFORGE_RPM_REPO" ]
-		then 
-			rpm_repo="http://fusionforge.fusionforge.org/rpm/5.3"
-		else
-			rpm_repo="$FFORGE_RPM_REPO"
-		fi
-		cat > /etc/yum.repos.d/fusionforge.repo <<-END
-# Name: FusionForge RPM Repository
-# URL: http://fusionforge.org/
-[fusionforge]
-name = Red Hat Enterprise \$releasever - fusionforge.org
-baseurl = $rpm_repo
-enabled = 0
-protect = 0
-gpgcheck = 0
-END
-	fi
-}
-
-addDagRPMForgeYumRepo() {
-	if [ ! -f "/etc/yum.repos.d/dag-rpmforge.repo" ]
-	then
-		msg green "Adding Dag RPMForge YUM repository" ]
-		if [ -z "$DAG_RPMFORGE_REPO" ]
-		then
-			rpm_repo="http://apt.sw.be/redhat"
-		else
-			rpm_repo="$DAG_RPMFORGE_REPO"
-		fi
-		cat > /etc/yum.repos.d/dag-rpmforge.repo <<-END
-# Name: RPMforge RPM Repository for Red Hat Enterprise \$releasever - dag
-# URL: http://rpmforge.net/
-[dag-rpmforge]
-name = Red Hat Enterprise $targetversion - RPMforge.net - dag
-baseurl = $rpm_repo/$targetversion/en/\$basearch/dag
-enabled = 0
-protect = 0
-gpgcheck = 0
-END
-	fi
-}
-
-deps_centos(){
-	deps_redhat
-}
-
-deps_rhel(){
-	deps_redhat
-}
-
-deps_fedora(){
-	deps_redhat
-}
-
-deps_ubuntu(){
-	deps_debian
-}
diff --git a/src/install/install5_post b/src/install/install5_post
deleted file mode 100644
index 13b96ff..0000000
--- a/src/install/install5_post
+++ /dev/null
@@ -1,94 +0,0 @@
-install5_post_redhat()
-{
-	hostname=$1
-
-	# Post installation fixes.
-	perl -spi -e "s/^#ServerName (.*):80/ServerName $hostname:80/" /etc/httpd/conf/httpd.conf
-	# Disable ssl
-	perl -spi -e "s/^Include/#Include/" $(forge_get_config config_path)/httpd.conf.d/ssl-on.inc
-	
-	chkconfig httpd on
-	chkconfig postgresql on
-	chkconfig iptables off
-	
-	service httpd restart
-	service iptables stop
-	msg="IMPORTANT: Service iptables (firewall) disabled, please reconfigure after"
-	
-	cp $scriptdir/packaging/cron.d/cron.fusionforge /etc/cron.d
-	cp $scriptdir/plugins/*/etc/cron.d/* /etc/cron.d/
-	service crond reload
-}
-
-install5_post_suse()
-{
-	hostname=$1
-
-	# Post installation fixes.
-	#perl -spi -e "s/^#ServerName (.*):80/ServerName $hostname:80/" /etc/apache2/httpd.conf
-
-	chkconfig -s apache2 on
-	chkconfig -s postgresql on
-
-	# Apache settings: modules
-	for m in dav dav_svn authz_svn ssl macro authz_groupfile; do
-		a2enmod $m
-		a2enflag $m
-	done
-	echo "Virtual hosts for ${hostname}:"
-	httpd2 -S -DSSL 2>&1 | grep ${hostname}
-
-	rcapache2 restart
-
-	rcSuSEfirewall2 stop
-	msg="IMPORTANT: Service SuSEfirewall2 stopped, please reconfigure after"
-
-	cp $scriptdir/packaging/cron.d/cron.fusionforge /etc/cron.d
-	cp $scriptdir/plugins/*/etc/cron.d/* /etc/cron.d/
-	rccron reload
-}
-
-install5_post_debian()
-{
-        if [ ! -e $(forge_get_config config_path)/ssl-cert.pem ] || [ ! -e $(forge_get_config config_path)/ssl-cert.key ] ; then
-            # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
-            if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then
-                # What, not even the snakeoil cert is there?  Let's generate it
-                make-ssl-cert generate-default-snakeoil
-            fi
-            # Right.  At this point, it should be safe to set the symlinks.
-            ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem $(forge_get_config config_path)/ssl-cert.pem
-            ln -s /etc/ssl/private/ssl-cert-snakeoil.key $(forge_get_config config_path)/ssl-cert.key
-        fi
-
-        for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
-            if [ ! -e $(forge_get_config config_path)/httpd.conf.d/$i ] ; then
-                cp $fusionforge_dir/etc/httpd.conf.d-opt/$i $(forge_get_config config_path)/httpd.conf.d/$i
-                if [ $i = "secrets.inc" ] ; then
-                    chmod 700 $(forge_get_config config_path)/httpd.conf.d/$i
-                fi
-                PATH=$fusionforge_dir/utils:$PATH manage-apache-config.sh install
-                mv $(forge_get_config config_path)/httpd.conf.d/$i.generated $(forge_get_config config_path)/httpd.conf.d/$i
-            fi
-        done
-
-	# Apache settings: modules
-	for m in dav dav_svn authz_svn ssl macro authz_groupfile; do
-		a2enmod $m
-	done
-
-	a2dissite default || a2dissite 000-default
-	service apache2 restart
-}
-
-install5_post_ubuntu()
-{
-	install5_post_debian
-}
-
-install5_post_unknown()
-{
-	echo "TODO"
-}
-
-
diff --git a/src/packaging/control/030web-apache2 b/src/packaging/control/030web-apache2
deleted file mode 100644
index 305b2f4..0000000
--- a/src/packaging/control/030web-apache2
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: @OLDPACKAGE at -web-apache2
-Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mpm-itk | apache2-mpm-itk, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, python, ssl-cert, libnusoap-php, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery, libjs-jquery-ui (>= 1.9~), libjs-jquery-ui-theme-overcast, javascript-common, ${misc:Depends}
-Recommends: locales | locales-all
-Provides: @OLDPACKAGE at -web
-Conflicts: @OLDPACKAGE at -web
-Description: collaborative development tool - web part (using Apache)
diff --git a/src/plugins/scmgit/packaging/control/133plugin-scmgit b/src/plugins/scmgit/packaging/control/133plugin-scmgit
deleted file mode 100644
index 654f091..0000000
--- a/src/plugins/scmgit/packaging/control/133plugin-scmgit
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: @PACKAGE at -plugin-scmgit
-Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7.4.1), php5-cli, acl, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm, @OLDPACKAGE at -plugin-scmgit
-Conflicts: @OLDPACKAGE at -plugin-scmgit (<< 5.0.51-2)
-Replaces: @OLDPACKAGE at -plugin-scmgit (<< 5.0.51-2)
-Description: collaborative development tool - Git plugin
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
deleted file mode 100755
index 4ef8d7a..0000000
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/sh
-. tests/scripts/common-functions
-. tests/scripts/common-vm
-
-set -e
-
-get_config
-
-export FORGE_HOME=/usr/share/gforge
-export HOST=$1
-case $HOST in
-    debian7.local)
-	export DIST=wheezy
-	VM=debian7
-	;;
-    debian8.local)
-	export DIST=jessie
-	VM=debian8
-	;;
-    *)
-	export DIST=jessie
-	VM=debian8
-	;;
-esac	
-
-export FILTER="deb/debian"
-
-prepare_workspace
-
-CHECKOUTPATH=$(pwd)
-
-COWBUILDERCONFIG=$BUILDERDIR/config/$DIST.config
-
-cd $CHECKOUTPATH/src
-PKGNAME=$(dpkg-parsechangelog | awk '/^Source:/ { print $2 }')
-PKGVERS=$(dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
-MAJOR=${PKGVERS%-*}
-SMAJOR=${MAJOR#*:}
-MINOR=${PKGVERS##*-}
-if [ -d $CHECKOUTPATH/.svn ] ; then
-    MINOR=-$MINOR+svn$(svn info | awk '/^Revision:/ { print $2 }')
-elif [ -d $CHECKOUTPATH/.bzr ] ; then
-    MINOR=-$MINOR+bzr$(bzr revno)
-elif [ -d $CHECKOUTPATH/.git ] ; then
-    MINOR=-$MINOR+git$(git describe --always)
-else
-    MINOR=-$MINOR+$(TZ=UTC date +%Y%m%d%H%M%S)
-fi
-ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
-
-# Build out of the source tree
-. $COWBUILDERCONFIG
-CHANGEFILE=${BUILDRESULT}/${PKGNAME}_${SMAJOR}${MINOR}_${ARCH}.changes
-cd $CHECKOUTPATH
-rm -rf $BUILDPLACE/$PKGNAME-$MAJOR
-cp -r src/ $BUILDPLACE/$PKGNAME-$MAJOR
-cd $BUILDPLACE/$PKGNAME-$MAJOR
-dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
-sed -i -e "1s/UNRELEASED/$DIST/" debian/changelog
-debian/rules debian/control
-pdebuild --configfile $COWBUILDERCONFIG --buildresult $BUILDRESULT
-
-cd $BUILDRESULT
-lintian -i $CHANGEFILE
-REPOPATH=$WORKSPACE/build/debian
-
-[ ! -d $REPOPATH ] || rm -r $REPOPATH
-mkdir -p $REPOPATH/conf
-DEFAULTKEY=buildbot@$(hostname -f)
-SIGNKEY=${DEBEMAIL:-$DEFAULTKEY}
-cat > $REPOPATH/conf/distributions <<EOF
-Codename: $DIST
-Suite: $DIST
-Components: main
-UDebComponents: main
-Architectures: amd64 i386 source
-Origin: buildbot.fusionforge.org
-Description: FusionForge autobuilt repository
-SignWith: $SIGNKEY
-EOF
-
-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 $VM $HOST
-start_vm_if_not_keeped -t $VM $HOST
-setup_debian_3rdparty_repo
-
-# Transfer preseeding
-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
-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 "apt-get update"
-# ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes dist-upgrade"
-
-ssh root@$HOST "apt-get update"
-ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install libapache2-mod-wsgi nscd"
-
-if [ "$DIST" = wheezy ] ; then
-    ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install javascript-common"
-
-    # Grab a more recent loggerhead (without pulling everything)
-    if ! ssh root@$HOST dpkg -l loggerhead | grep -q ^ii ; then
-	ssh root@$HOST "apt-get -y --force-yes install wget gdebi-core;wget -c http://snapshot.debian.org/archive/debian/20121107T152130Z/pool/main/l/loggerhead/loggerhead_1.19%7Ebzr477-1_all.deb; gdebi --non-interactive loggerhead_1.19~bzr477-1_all.deb"
-    fi
-
-    ssh root@$HOST "echo \"deb $DEBMIRROR wheezy-backports main\" >> /etc/apt/sources.list.d/wheezy-backports.list"
-    ssh root@$HOST "apt-get update"
-    ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install -t wheezy-backports libjs-jquery-ui"
-    ssh root@$HOST "rm /etc/apt/sources.list.d/wheezy-backports.list"
-fi
-
-ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
-ssh root@$HOST "apt-get update"
-
-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
-ssh root@$HOST "apt-get update"
-
-# Install fusionforge
-ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install rsync postgresql-contrib fusionforge-full"
-
-config_path=$(ssh root@$HOST forge_get_config config_path)
-data_path=$(ssh root@$HOST forge_get_config data_path)
-
-echo "Set forge admin password"
-ssh root@$HOST "/usr/share/gforge/bin/forge_set_password $FORGE_ADMIN_USERNAME $FORGE_ADMIN_PASSWORD"
-ssh root@$HOST "LANG=C a2dissite default ; LANG=C a2dissite 000-default ; LANG=C invoke-rc.d apache2 reload"
-ssh root@$HOST "(echo [core];echo use_ssl=no) > $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "[ -e $data_path/.bazaar/bazaar.conf ] && sed -i -e s,https://,http://,g $data_path/.bazaar/bazaar.conf"
-ssh root@$HOST "service nscd restart"
-
-# Dump database
-echo "Dump freshly installed database"
-ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
-
-# Stop cron
-echo "Stop cron daemon"
-ssh root@$HOST "invoke-rc.d cron stop" || true
-
-# Install selenium
-ssh root@$HOST "apt-get -o debug::pkgproblemresolver=true -y install selenium"
-
-# Install selenium tests
-ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
-rsync -a --delete tests/ root@$HOST:$FORGE_HOME/tests/
-
-# Transfer hudson config
-ssh root@$HOST "cat > $FORGE_HOME/tests/config/phpunit" <<-EOF
-HUDSON_URL=$HUDSON_URL
-JOB_NAME=$JOB_NAME
-EOF
-
-# Add alias to /etc/hosts
-ssh root@$HOST 'sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts'
- 
-# Run tests
-retcode=0
-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/
-
-cd $CHECKOUTPATH
-for i in *_source.changes ; do echo $i ; echo $(basename $i _source.changes)_*.build ; cat $i | sed -e 0,/^Checksums/d -e /^Checksums/,\$d | awk '{print $3}' ; done | xargs rm || true
-
-stop_vm_if_not_keeped -t $VM $@
-exit $retcode
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
deleted file mode 100755
index 14b3913..0000000
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-. tests/scripts/common-functions
-. tests/scripts/common-vm
-
-get_config
-
-export FORGE_HOME=/usr/share/gforge
-export HOST=$1
-
-export FILTER="rpm/centos"
-
-case $HOST in
-    centos5.local)
-	VM=centos5
-	;;
-    centos6.local)
-	VM=centos6
-	;;
-    *)
-	VM=centos6
-	;;
-esac	
-
-prepare_workspace
-destroy_vm -t $VM $HOST
-start_vm_if_not_keeped -t $VM $HOST
-
-setup_redhat_3rdparty_repo
-
-# BUILD FUSIONFORGE REPO
-echo "Build FUSIONFORGE REPO in $BUILDRESULT"
-make -f Makefile.rh BUILDRESULT=$BUILDRESULT RPM_TMP=$RPM_TMP fusionforge dist
-
-# TRANSFER FUSIONFORGE REPO
-rsync -a --delete $BUILDRESULT/ root@$HOST:/root/fusionforge_repo/
-
-# SETUP FUSIONFORGE REPO
-echo "Installing FUSIONFORGE REPO"
-ssh root@$HOST "cat > /etc/yum.repos.d/FusionForge.repo" <<-EOF
-[FusionForge]
-name = Red Hat Enterprise \$releasever - fusionforge.org
-baseurl = file:///root/fusionforge_repo/noarch/
-enabled = 1
-protect = 0
-gpgcheck = 0
-EOF
-
-setup_dag_repo $@
-if [ $VM = centos6 ] ; then
-    setup_epel_repo $@
-fi
-
-sleep 5
-if [ $VM = centos6 ] ; then
-    ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
-fi
-ssh root@$HOST "FFORGE_DB=$DB_NAME FFORGE_USER=gforge FFORGE_ADMIN_USER=$FORGE_ADMIN_USERNAME FFORGE_ADMIN_PASSWORD=$FORGE_ADMIN_PASSWORD export FFORGE_DB FFORGE_USER FFORGE_ADMIN_USER FFORGE_ADMIN_PASSWORD; yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-authldap fusionforge-plugin-scmgit fusionforge-plugin-blocks"
-
-config_path=$(ssh root@$HOST forge_get_config config_path)
-
-ssh root@$HOST "(echo [core];echo use_ssl=no) > $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
-# Install a fake sendmail to catch all outgoing emails.
-ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#$FORGE_HOME/tests/scripts/catch_mail.php# $config_path/config.ini.d/defaults.ini"
-
-echo "Stop cron daemon"
-ssh root@$HOST "service crond stop" || true
-
-if [ $VM = centos6 ] ; then
-    ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
-fi
-
-# Install selenium
-ssh root@$HOST "yum -y install selenium"
-
-# Install selenium tests
-ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
-rsync -a --delete tests/ root@$HOST:$FORGE_HOME/tests/
-
-# Transfer hudson config
-ssh root@$HOST "cat > $FORGE_HOME/tests/config/phpunit" <<-EOF
-HUDSON_URL=$HUDSON_URL
-JOB_NAME=$JOB_NAME
-EOF
-
-# Add alias to /etc/hosts
-ssh root@$HOST 'sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts'
- 
-# Run tests
-retcode=0
-echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh rpm/centos"
-retcode=$?
-rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
-scp root@$HOST:/tmp/gforge-*.log $WORKSPACE/reports/
-
-stop_vm_if_not_keeped -t $VM $@
-exit $retcode
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
deleted file mode 100755
index b18a255..0000000
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh -e
-. tests/scripts/common-functions
-. tests/scripts/common-vm
-
-get_config
-
-export FORGE_HOME=/opt/gforge
-export HOST=$1
-
-export FILTER="src/centos"
-
-case $HOST in
-    centos5.local)
-	VM=centos5
-	;;
-    centos6.local)
-	VM=centos6
-	;;
-    *)
-	VM=centos6
-	;;
-esac	
-
-prepare_workspace
-destroy_vm -t $VM $HOST
-start_vm_if_not_keeped -t $VM $HOST
-
-setup_redhat_3rdparty_repo
-
-#[ ! -e $HOME/doxygen-1.6.3/bin/doxygen ] || make build-doc DOCSDIR=$WORKSPACE/apidocs DOXYGEN=$HOME/doxygen-1.6.3/bin/doxygen
-#make BUILDRESULT=$WORKSPACE/build/packages buildtar
-#make -f Makefile.rh BUILDRESULT=$WORKSPACE/build/packages src
-
-setup_dag_repo $@
-if [ $VM = centos6 ] ; then
-    setup_epel_repo $@
-fi
-
-echo "Create $FORGE_HOME if necessary"
-ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
-
-echo "Sync code on root@$HOST:$FORGE_HOME"
-rsync -a --delete src/ root@$HOST:$FORGE_HOME/
-
-echo "Run Install on $HOST"
-ssh root@$HOST "$FORGE_HOME/install-ng --auto --reinit"
-
-echo "Dump freshly installed database"
-ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
-
-config_path=$(ssh root@$HOST $FORGE_HOME/utils/forge_get_config config_path)
-
-echo "Set use_ssl=no"
-ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > $config_path/config.ini.d/zzz-zbuildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> $config_path/config.ini.d/zzz-buildbot.ini"
-
-#  Install a fake sendmail to catch all outgoing emails.
-# ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#/opt/tests/scripts/catch_mail.php# $config_path/local.inc"
-
-echo "Stop cron daemon"
-ssh root@$HOST "service crond stop" || true
-
-if [ $VM = centos6 ] ; then
-    ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
-    ssh root@$HOST "yum -y remove mod_ssl ; service httpd restart"
-fi
-
-# Install selenium
-ssh root@$HOST "yum -y install selenium"
-
-# Install selenium tests
-rsync -a --delete tests/ root@$HOST:$FORGE_HOME/tests/
-
-# Transfer hudson config
-ssh root@$HOST "cat > $FORGE_HOME/tests/config/phpunit" <<-EOF
-HUDSON_URL=$HUDSON_URL
-JOB_NAME=$JOB_NAME
-EOF
-
-# Add alias to /etc/hosts
-ssh root@$HOST 'sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts'
- 
-# Run tests
-retcode=0
-echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh src/centos" || retcode=$?
-rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
-scp root@$HOST:/tmp/gforge-*.log $WORKSPACE/reports/
-
-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
deleted file mode 100755
index 4159d16..0000000
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-. tests/scripts/common-functions
-. tests/scripts/common-vm
-
-export FORGE_HOME=/opt/gforge
-export HOST=$1
-case $HOST in
-    debian7.local)
-	export DIST=wheezy
-	VM=debian7
-	;;
-    debian8.local)
-	export DIST=jessie
-	VM=debian8
-	;;
-    *)
-	export DIST=jessie
-	VM=debian8
-	;;
-esac	
-
-export FILTER="src/debian"
-
-get_config $@
-prepare_workspace
-destroy_vm -t $VM $@
-start_vm_if_not_keeped -t $VM $@
-
-setup_debian_3rdparty_repo
-
-ssh root@$HOST "apt-get update"
-
-echo "Sync code on root@$HOST:$FORGE_HOME"
-ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
-rsync -a --delete src/ root@$HOST:$FORGE_HOME/
-rsync -a --delete tests/ root@$HOST:$FORGE_HOME/tests/
-
-echo "Run Install on $HOST"
-ssh root@$HOST "$FORGE_HOME/install-ng --auto --reinit"
-
-# Dump database
-echo "Dump freshly installed database"
-ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
-
-config_path=$(ssh root@$HOST $FORGE_HOME/utils/forge_get_config config_path)
-
-echo "Set use_ssl=no"
-ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > $config_path/config.ini.d/zzz-zbuildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> $config_path/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> $config_path/config.ini.d/zzz-buildbot.ini"
-
-# Stop cron
-echo "Stop cron daemon"
-ssh root@$HOST "service crond stop" || true
-
-# Install selenium
-ssh root@$HOST "apt-get -y install selenium"
-
-# Transfer hudson config
-ssh root@$HOST "cat > $FORGE_HOME/tests/config/phpunit" <<-EOF
-HUDSON_URL=$HUDSON_URL
-JOB_NAME=$JOB_NAME
-EOF
-
-# Add alias to /etc/hosts
-ssh root@$HOST 'sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts'
- 
-# Run tests
-retcode=0
-echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh src/debian"
-retcode=$?
-rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
-
-stop_vm_if_not_keeped -t $VM $@
-exit $retcode

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

Summary of changes:
 src/install/deps                                   |  225 --------------------
 src/install/install5_post                          |   94 --------
 src/packaging/control/030web-apache2               |    7 -
 .../scmgit/packaging/control/133plugin-scmgit      |    7 -
 tests/scripts/fusionforge-build-and-test-deb.sh    |  182 ----------------
 tests/scripts/fusionforge-build-and-test-rpm.sh    |  100 ---------
 .../scripts/fusionforge-build-and-test-src-cos.sh  |   92 --------
 .../scripts/fusionforge-build-and-test-src-deb.sh  |   76 -------
 8 files changed, 783 deletions(-)
 delete mode 100644 src/install/deps
 delete mode 100644 src/install/install5_post
 delete mode 100644 src/packaging/control/030web-apache2
 delete mode 100644 src/plugins/scmgit/packaging/control/133plugin-scmgit
 delete mode 100755 tests/scripts/fusionforge-build-and-test-deb.sh
 delete mode 100755 tests/scripts/fusionforge-build-and-test-rpm.sh
 delete mode 100755 tests/scripts/fusionforge-build-and-test-src-cos.sh
 delete mode 100755 tests/scripts/fusionforge-build-and-test-src-deb.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list