[Fusionforge-commits] r7914 - in trunk: gforge tests/func/Testing

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Jul 1 21:34:44 CEST 2009


Author: aljeux
Date: 2009-07-01 21:34:44 +0200 (Wed, 01 Jul 2009)
New Revision: 7914

Modified:
   trunk/gforge/gforge-install-1-deps.php
   trunk/tests/func/Testing/SeleniumRemoteSuite.php
Log:
Initial code for adding installation of htmlpurifier (via a yum repo)

Modified: trunk/gforge/gforge-install-1-deps.php
===================================================================
--- trunk/gforge/gforge-install-1-deps.php	2009-06-30 20:44:20 UTC (rev 7913)
+++ trunk/gforge/gforge-install-1-deps.php	2009-07-01 19:34:44 UTC (rev 7914)
@@ -45,14 +45,15 @@
 }
 
 function installRedhat() {
+	addFusionForgeYumRepo();
 	INFO("Installing packages: Executing YUM. Please wait...\n\n\n");
-	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh inetd which liberation-fonts");
+	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh inetd which liberation-fonts htmlpurifier");
 }
 
 function installRHEL4() {
-
 	INFO("Installing packages: Executing UP2DATE. Please wait...\n\n\n");
 	passthru("up2date --install php php-gd php-pgsql mailman postgresql-server postgresql-contrib rcs cvs httpd subversion perl-URI mod_dav_svn ssh postfix mod_ssl wget");
+	INFO(RED."You Must Install htmlpurifier manually.");
 }
 
 function installDebian() {
@@ -81,6 +82,8 @@
 
 	INFO("Starting Apache");
 	passthru("/etc/init.d/apache2 start");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
 }
 
 function installOPENSUSE() {
@@ -92,6 +95,8 @@
 	passthru("rcpostgresql restart");
 	INFO("Restarting Apache...");
 	passthru("rcapache2 restart");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
 }
 
 function installArk() {
@@ -101,8 +106,31 @@
 
 	INFO("Restarting PostgreSQL\n");
 	passthru("/sbin/service postgresql restart");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
 }
 
+function addFusionForgeYumRepo() {
+	INFO("Adding FusionForge YUM repository\n");
+
+	if (getenv('FFORGE_RPM_REPO')) {
+		$rpm_repo = getenv('FFORGE_RPM_REPO');
+	} else {
+		$rpm_repo = 'http://fusionforge.org/rpm/';
+	}
+
+	$repo = '
+# Name: FusionForge RPM Repository
+# URL: http://fusionforge.org/
+[fusionforge]
+name = Red Hat Enterprise $releasever - fusionforge.org
+baseurl = '.$rpm_repo.'
+enabled = 1
+protect = 0
+gpgcheck = 0';
+	file_put_contents('/etc/yum.repos.d/fusionforge.repo', $repo);
+}
+
 if (count($argv) < 2) {
 	if ( is_file('/etc/SuSE-release') ) {
 		if ( exec('grep openSUSE /etc/SuSE-release') ) {

Modified: trunk/tests/func/Testing/SeleniumRemoteSuite.php
===================================================================
--- trunk/tests/func/Testing/SeleniumRemoteSuite.php	2009-06-30 20:44:20 UTC (rev 7913)
+++ trunk/tests/func/Testing/SeleniumRemoteSuite.php	2009-07-01 19:34:44 UTC (rev 7914)
@@ -7,7 +7,7 @@
 		system("cd scripts; ./start_vm.sh centos52");
 		system("scp ../../build/packages/fusionforge-*allinone.tar.bz2 root at centos52:");
 		system("ssh root at centos52 'tar jxf fusionforge-*allinone.tar.bz2'");
-		system("ssh root at centos52 'cd fusionforge-*; FFORGE_DB=fforge FFORGE_USER=gforge FFORGE_ADMIN_USER=ffadmin FFORGE_ADMIN_PASSWORD=ffadmin ./install.sh centos52.local'");
+		system("ssh root at centos52 'cd fusionforge-*; FFORGE_RPM_REPO=http://buildbot.fusionforge.org:8080/cruisecontrol/artifacts/fusionforge-trunk/current/packages/ FFORGE_DB=fforge FFORGE_USER=gforge FFORGE_ADMIN_USER=ffadmin FFORGE_ADMIN_PASSWORD=ffadmin ./install.sh centos52.local'");
 
 		system("ssh root at centos52 'mkdir -p /opt/tests/func'");
 		system("scp func/db_reload.php root at centos52:/opt/tests/func/");




More information about the Fusionforge-commits mailing list