[Fusionforge-commits] r13144 - in branches/Branch_5_1: src tests/scripts

[Christian Bayle]

Author: cbayle
Date: 2011-04-15 23:02:34 +0200 (Fri, 15 Apr 2011)
New Revision: 13144

Modified:
   branches/Branch_5_1/src/fusionforge-install-1-deps.php
   branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-source.sh
Log:
use DAG_RPMFORGE_REPO if defined


Modified: branches/Branch_5_1/src/fusionforge-install-1-deps.php
===================================================================
--- branches/Branch_5_1/src/fusionforge-install-1-deps.php	2011-04-15 21:02:24 UTC (rev 13143)
+++ branches/Branch_5_1/src/fusionforge-install-1-deps.php	2011-04-15 21:02:34 UTC (rev 13144)
@@ -133,12 +133,19 @@
 }
 function addDagRPMForgeYumRepo() {
 	INFO("Adding Dag RPMForge YUM repository\n");
+
+	if (getenv('DAG_RPMFORGE_REPO')) {
+		$rpm_repo = getenv('DAG_RPMFORGE_REPO');
+	} else {
+		$rpm_repo = 'http://apt.sw.be/redhat/el5/en/$basearch/dag';
+	}
+
 	$repo = '
 # Name: RPMforge RPM Repository for Red Hat Enterprise 5 - dag
 # URL: http://rpmforge.net/
 [dag-rpmforge]
 name = Red Hat Enterprise $releasever - RPMforge.net - dag
-baseurl = http://apt.sw.be/redhat/el5/en/$basearch/dag
+baseurl = '.$rpm_repo.'
 #mirrorlist = http://apt.sw.be/redhat/el5/en/mirrors-rpmforge
 enabled = 1
 protect = 0

Modified: branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-source.sh	2011-04-15 21:02:24 UTC (rev 13143)
+++ branches/Branch_5_1/tests/scripts/fusionforge-build-and-test-source.sh	2011-04-15 21:02:34 UTC (rev 13144)
@@ -108,7 +108,7 @@
 fi
 ssh root@$HOST 'tar jxf fusionforge-*.tar.bz2'
 [ ! -e "/tmp/timedhosts.txt" ] || scp -p /tmp/timedhosts.txt root@$HOST:/var/cache/yum/timedhosts.txt
-ssh root@$HOST "cd fusionforge-*; FFORGE_RPM_REPO=$FFORGE_RPM_REPO FFORGE_DB=fforge FFORGE_USER=gforge FFORGE_ADMIN_USER=ffadmin FFORGE_ADMIN_PASSWORD=ffadmin ./install.sh $HOST"
+ssh root@$HOST "cd fusionforge-*; FFORGE_RPM_REPO=$FFORGE_RPM_REPO DAG_RPMFORGE_REPO=$DAG_RPMFORGE_REPO FFORGE_DB=fforge FFORGE_USER=gforge FFORGE_ADMIN_USER=ffadmin FFORGE_ADMIN_PASSWORD=ffadmin ./install.sh $HOST"
 scp -p root@$HOST:/var/cache/yum/timedhosts.txt /tmp/timedhosts.txt || true
 ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-builbot.ini"
 ssh root@$HOST "cd /root/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot DB_NAME=$DB_NAME php db_reload.php"