[Fusionforge-commits] FusionForge branch Branch_5_3 updated. fe29d495aeb9d468fca4f89350415ea147ce14d6

Roland Mas lolando at fusionforge.org
Wed Jul 30 15:23:28 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, Branch_5_3 has been updated
       via  fe29d495aeb9d468fca4f89350415ea147ce14d6 (commit)
      from  da8231567fbfe3f438053f70ea56201e4fd7cb70 (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 fe29d495aeb9d468fca4f89350415ea147ce14d6
Author: Roland Mas <lolando at debian.org>
Date:   Wed Jul 30 15:23:18 2014 +0200

    More replacements of hardcoded paths

diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 947a30e..1fc9b54 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -127,12 +127,15 @@ 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)
+
 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) > /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
+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 /var/lib/gforge/.bazaar/bazaar.conf ] && sed -i -e s,https://,http://,g /var/lib/gforge/.bazaar/bazaar.conf"
 ssh root@$HOST "service nscd restart"
 
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index 430fbf0..fce47ef 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -55,12 +55,14 @@ if [ $VM = centos6 ] ; then
 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"
 
-ssh root@$HOST '(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini'
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
+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# /etc/gforge/config.ini.d/defaults.ini"
+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
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index c13f38c..702b9ef 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -47,13 +47,15 @@ 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_get_config config_path)
+
 echo "Set use_ssl=no"
-ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
+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# /etc/gforge/local.inc"
+# 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
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index b52f809..cf99ddd 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -42,10 +42,12 @@ 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_get_config config_path)
+
 echo "Set use_ssl=no"
-ssh root@$HOST "(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-zbuildbot.ini"
-ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
+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"
diff --git a/vm/scripts/run-testsuite.sh b/vm/scripts/run-testsuite.sh
index 50496f4..1050ae6 100755
--- a/vm/scripts/run-testsuite.sh
+++ b/vm/scripts/run-testsuite.sh
@@ -15,7 +15,9 @@ cd /usr/src/fusionforge/3rd-party/selenium
 make
 dpkg -i /usr/src/build/debian/pool/main/s/selenium/selenium_*_all.deb
 
-(echo [mediawiki]; echo unbreak_frames=yes) > /etc/gforge/config.ini.d/zzz-buildbot.ini
+config_path=$(cd /usr/src/fusionforge;utils/forge_get_config_basic fhs config_path)
+
+(echo [mediawiki]; echo unbreak_frames=yes) > $config_path/config.ini.d/zzz-buildbot.ini
 
 # Test dependencies
 aptitude -y install php5-cli phpunit phpunit-selenium

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

Summary of changes:
 tests/scripts/fusionforge-build-and-test-deb.sh     |    9 ++++++---
 tests/scripts/fusionforge-build-and-test-rpm.sh     |   10 ++++++----
 tests/scripts/fusionforge-build-and-test-src-cos.sh |   10 ++++++----
 tests/scripts/fusionforge-build-and-test-src-deb.sh |    8 +++++---
 vm/scripts/run-testsuite.sh                         |    4 +++-
 5 files changed, 26 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list