[Fusionforge-commits] r13014 - in trunk: src tests/scripts

Christian Bayle cbayle at fusionforge.org
Sun Apr 3 23:04:42 CEST 2011


Author: cbayle
Date: 2011-04-03 23:04:41 +0200 (Sun, 03 Apr 2011)
New Revision: 13014

Modified:
   trunk/src/fusionforge-install-1-deps.php
   trunk/tests/scripts/fusionforge-build-and-test-source.sh
Log:
take local fusionforge repo when available


Modified: trunk/src/fusionforge-install-1-deps.php
===================================================================
--- trunk/src/fusionforge-install-1-deps.php	2011-04-03 20:49:54 UTC (rev 13013)
+++ trunk/src/fusionforge-install-1-deps.php	2011-04-03 21:04:41 UTC (rev 13014)
@@ -112,6 +112,7 @@
 }
 
 function addFusionForgeYumRepo() {
+	if(!is_file("/etc/yum.repos.d/fusionforge.repo")){
 	INFO("Adding FusionForge YUM repository\n");
 
 	if (getenv('FFORGE_RPM_REPO')) {
@@ -130,6 +131,7 @@
 protect = 0
 gpgcheck = 0';
 	file_put_contents('/etc/yum.repos.d/fusionforge.repo', $repo);
+	}
 }
 function addDagRPMForgeYumRepo() {
 	if(!is_file("/etc/yum.repos.d/dag-rpmforge.repo")){

Modified: trunk/tests/scripts/fusionforge-build-and-test-source.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-04-03 20:49:54 UTC (rev 13013)
+++ trunk/tests/scripts/fusionforge-build-and-test-source.sh	2011-04-03 21:04:41 UTC (rev 13014)
@@ -59,10 +59,6 @@
 
 (cd 3rd-party/selenium ; make getselenium)
 
-cp src/rpm-specific/fusionforge.repo $WORKSPACE/build/packages/fusionforge.repo
-sed -i "s#http://fusionforge.org/#${HUDSON_URL}#" $WORKSPACE/build/packages/fusionforge.repo
-sed -i "s#baseurl = .*#baseurl = $FFORGE_RPM_REPO/#" $WORKSPACE/build/packages/fusionforge.repo
-
 if $KEEPVM
 then
 	echo "Destroying vm $HOST"
@@ -71,6 +67,15 @@
 
 (cd tests/scripts ; ./start_vm.sh $HOST)
 
+# FUSIONFORGE REPO
+cp src/rpm-specific/fusionforge.repo $WORKSPACE/build/packages/fusionforge.repo
+sed -i "s#http://fusionforge.org/#${HUDSON_URL}#" $WORKSPACE/build/packages/fusionforge.repo
+if [ ! -z "$FFORGE_RPM_REPO" ]
+then
+	sed -i "s#baseurl = .*#baseurl = ${FFORGE_RPM_REPO}/#" $WORKSPACE/build/packages/fusionforge.repo
+fi
+scp $WORKSPACE/build/packages/fusionforge.repo root@$HOST:/etc/yum.repos.d/
+
 # DAG
 cp src/rpm-specific/dag-rpmforge.repo $WORKSPACE/build/packages/dag-rpmforge.repo
 if [ ! -z "$DAG_RPMFORGE_REPO" ] ; then




More information about the Fusionforge-commits mailing list