[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 767042d5f7900793e0c7edd91b9f43a6868b68b6

Roland Mas lolando at fusionforge.org
Mon Dec 15 11:34:09 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, Branch_5_3 has been updated
       via  767042d5f7900793e0c7edd91b9f43a6868b68b6 (commit)
      from  46b7878cf07b162d56ba45b5d43cf644dbcb76c9 (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 767042d5f7900793e0c7edd91b9f43a6868b68b6
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 15 11:34:06 2014 +0100

    Install phpunit…

diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index 791c947..1d7e94a 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -47,6 +47,8 @@ setup_dag_repo $@
 case $VM in
     centos5|centos6)
 	setup_epel_repo $@
+	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
+	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 
@@ -55,9 +57,6 @@ ssh root@$HOST "yum install -y rsync"
 setup_redhat_3rdparty_repo
 
 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)
@@ -72,10 +71,6 @@ ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#$FORGE_HOME/tests/scripts/catc
 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"
 
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index d9487a1..2957472 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -33,6 +33,8 @@ setup_dag_repo $@
 case $VM in
     centos5|centos6)
 	setup_epel_repo $@
+	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
+	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 
@@ -66,7 +68,6 @@ 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
 

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

Summary of changes:
 tests/scripts/fusionforge-build-and-test-rpm.sh     |    9 ++-------
 tests/scripts/fusionforge-build-and-test-src-cos.sh |    3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list