[Fusionforge-commits] r13189 - in trunk/tests: config scripts
Christian Bayle
cbayle at fusionforge.org
Thu Apr 21 10:22:30 CEST 2011
Author: cbayle
Date: 2011-04-21 10:22:30 +0200 (Thu, 21 Apr 2011)
New Revision: 13189
Modified:
trunk/tests/config/default
trunk/tests/scripts/fusionforge-build-and-test-deb.sh
Log:
Define default values for debian mirrors
Modified: trunk/tests/config/default
===================================================================
--- trunk/tests/config/default 2011-04-20 20:34:24 UTC (rev 13188)
+++ trunk/tests/config/default 2011-04-21 08:22:30 UTC (rev 13189)
@@ -37,3 +37,5 @@
REMOTESELENIUM=false
KEEPVM=false
DNSDOMAIN=local
+DEBMIRROR=http://cdn.debian.net/debian/
+DEBMIRRORSEC=http://security.debian.org/
Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh 2011-04-20 20:34:24 UTC (rev 13188)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh 2011-04-21 08:22:30 UTC (rev 13189)
@@ -84,14 +84,8 @@
scp -r $WORKSPACE/build/config root@$HOST:/root
scp 3rd-party/selenium/binary/selenium-server-current/selenium-server.jar root@$HOST:/root
ssh root@$HOST "cat /root/tests/preseed/* | LANG=C debconf-set-selections"
-if [ "x$DEBMIRROR" != "x" ]
-then
- ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
-fi
-if [ "x$DEBMIRRORSEC" != "x" ]
-then
- ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"
-fi
+ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
+ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"
# Temporary hack to grab libjs-jquery-tipsy from unstable until it reaches testing/backports
if [ $DIST = squeeze ] ; then
More information about the Fusionforge-commits
mailing list