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

Alain Peyrat aljeux at fusionforge.org
Sun Nov 13 10:46:59 CET 2011


Author: aljeux
Date: 2011-11-13 10:46:58 +0100 (Sun, 13 Nov 2011)
New Revision: 14790

Modified:
   trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
   trunk/tests/scripts/fusionforge-build-and-test-tgz-cos.sh
Log:
Drop timedhosts.txt file in tests, no longer used

Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-13 09:46:52 UTC (rev 14789)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-13 09:46:58 UTC (rev 14790)
@@ -16,10 +16,8 @@
 setup_dag_repo $@
 
 sleep 5
-[ ! -e "/tmp/timedhosts.txt" ] || scp -p /tmp/timedhosts.txt root@$HOST:/var/cache/yum/timedhosts.txt
 ssh root@$HOST "FFORGE_DB=$DB_NAME FFORGE_USER=gforge FFORGE_ADMIN_USER=$FORGE_ADMIN_USERNAME FFORGE_ADMIN_PASSWORD=$FORGE_ADMIN_PASSWORD export FFORGE_DB FFORGE_USER FFORGE_ADMIN_USER FFORGE_ADMIN_PASSWORD; yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-ldapextauth fusionforge-plugin-scmgit fusionforge-plugin-blocks"
 
-scp -p root@$HOST:/var/cache/yum/timedhosts.txt /tmp/timedhosts.txt || true
 ssh root@$HOST '(echo [core];echo use_ssl=no;echo use_fti=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini'
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
 # Install a fake sendmail to catch all outgoing emails.

Modified: trunk/tests/scripts/fusionforge-build-and-test-tgz-cos.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-tgz-cos.sh	2011-11-13 09:46:52 UTC (rev 14789)
+++ trunk/tests/scripts/fusionforge-build-and-test-tgz-cos.sh	2011-11-13 09:46:58 UTC (rev 14790)
@@ -106,9 +106,7 @@
 	scp ../build/packages/fusionforge-*.tar.bz2 root@$HOST:
 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 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-zbuildbot.ini"
 ssh root@$HOST "cd /root/tests/func; CONFIGURED=true CONFIG_PHP=config.php.buildbot DB_NAME=$DB_NAME php db_reload.php"
 ssh root@$HOST "su - postgres -c \"pg_dump -Fc $DB_NAME\" > /root/dump"




More information about the Fusionforge-commits mailing list