[Fusionforge-commits] r14529 - trunk/tests/scripts

Christian Bayle cbayle at fusionforge.org
Sun Oct 2 21:14:16 CEST 2011


Author: cbayle
Date: 2011-10-02 21:14:16 +0200 (Sun, 02 Oct 2011)
New Revision: 14529

Modified:
   trunk/tests/scripts/fusionforge-build-and-test-deb.sh
Log:
Use libjs-jquery-tipsy backport


Modified: trunk/tests/scripts/fusionforge-build-and-test-deb.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-10-02 19:08:42 UTC (rev 14528)
+++ trunk/tests/scripts/fusionforge-build-and-test-deb.sh	2011-10-02 19:14:16 UTC (rev 14529)
@@ -8,11 +8,8 @@
 destroy_vm $@
 start_vm_if_not_keeped $@
 
-make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian clean
-(cd 3rd-party/php-mail-mbox ; dpkg-source -x php-mail-mbox_0.6.3-1coclico1.dsc)
-(cd 3rd-party/php-mail-mbox ; make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze)
-(cd 3rd-party/selenium ; make getselenium)
-make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze
+# Build 3rd-party 
+make -C 3rd-party -f Makefile.deb BUILDRESULT=$BUILDRESULT LOCALREPODEB=$WORKSPACE/build/debian BUILDDIST=$DIST DEBMIRROR=$DEBMIRROR botclean botbuild
 
 # Transfer preseeding
 cat tests/preseed/* | sed s/@FORGE_ADMIN_PASSWORD@/$FORGE_ADMIN_PASSWORD/ | ssh root@$HOST "LANG=C debconf-set-selections"
@@ -21,22 +18,6 @@
 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
-    ssh root@$HOST "echo \"deb $DEBMIRROR unstable main\" >> /etc/apt/sources.list"
-    ssh root@$HOST "cat >> /etc/apt/apt.conf.d/unstable" <<EOF
-APT::Default-Release "$DIST";
-EOF
-    ssh root@$HOST "cat >> /etc/apt/preferences.d/unstable" <<EOF
-Package: *
-Pin: release a=unstable
-Pin-Priority: 50
-
-EOF
-    ssh root@$HOST "apt-get update"
-    ssh root@$HOST "apt-get install -y --force-yes -t unstable libjs-jquery-tipsy"
-fi
-
 ssh root@$HOST "echo \"deb file:/debian $DIST main\" >> /etc/apt/sources.list"
 scp -r $WORKSPACE/build/debian root@$HOST:/ 
 gpg --export --armor | ssh root@$HOST "apt-key add -"




More information about the Fusionforge-commits mailing list