[Fusionforge-commits] r10283 - in trunk/tests: func scripts

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Jul 21 21:53:58 CEST 2010


Author: aljeux
Date: 2010-07-21 21:53:58 +0200 (Wed, 21 Jul 2010)
New Revision: 10283

Modified:
   trunk/tests/func/config.php.buildbot
   trunk/tests/scripts/fusionforge-github-build-and-test-rpm.sh
   trunk/tests/scripts/fusionforge-trunk-test-rpm.sh
Log:
hudson: Use env for DB_NAME (gforge for rpm, fforge for source)

Modified: trunk/tests/func/config.php.buildbot
===================================================================
--- trunk/tests/func/config.php.buildbot	2010-07-21 18:39:31 UTC (rev 10282)
+++ trunk/tests/func/config.php.buildbot	2010-07-21 19:53:58 UTC (rev 10283)
@@ -22,7 +22,7 @@
 
 // Database connection parameters.
 define('DB_TYPE', 'pgsql');         // Values: mysql, pgsql
-define('DB_NAME', 'fforge');
+define('DB_NAME', getenv('DB_NAME'));
 define('DB_USER', 'gforge');
 define('DB_PASSWORD', '@@FFDB_PASS@@');
 define('DB_INIT_CMD', "ssh root@".HOST." 'cd /opt/tests/func 2>/dev/null || cd /usr/share/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot php db_reload.php'");

Modified: trunk/tests/scripts/fusionforge-github-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-github-build-and-test-rpm.sh	2010-07-21 18:39:31 UTC (rev 10282)
+++ trunk/tests/scripts/fusionforge-github-build-and-test-rpm.sh	2010-07-21 19:53:58 UTC (rev 10283)
@@ -6,6 +6,7 @@
 export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
 export FFORGE_RPM_REPO=${HUDSON_URL}job/$JOB_NAME/ws/build/packages
 export HOST=centos52.local
+export DB_NAME=gforge
 export CONFIGURED=true
 
 rm -fr build/ reports/

Modified: trunk/tests/scripts/fusionforge-trunk-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-trunk-test-rpm.sh	2010-07-21 18:39:31 UTC (rev 10282)
+++ trunk/tests/scripts/fusionforge-trunk-test-rpm.sh	2010-07-21 19:53:58 UTC (rev 10283)
@@ -6,6 +6,7 @@
 export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
 export FFORGE_RPM_REPO=${HUDSON_URL}job/fusionforge-trunk-build-rpm/ws/build/packages
 export HOST=centos52.local
+export DB_NAME=gforge
 export CONFIGURED=true
 
 rm -fr build/ reports/




More information about the Fusionforge-commits mailing list