This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via bdce2bd4bfe3bc28e53ab3e51b272d242ef510cb (commit)
from 7f6eacf23bef06b59b78449adb02daa7b1fe2ba3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bdce2bd4bfe3bc28e53ab3e51b272d242ef510cb
commit bdce2bd4bfe3bc28e53ab3e51b272d242ef510cb
Author: Sylvain Beucler <[email protected]>
Date: Wed Sep 9 15:20:22 2015 +0200
testsuite: clean-ups while attempting to move host-is-up detection in
lxc-wrapper
diff --git a/tests/buildbot/Makefile b/tests/buildbot/Makefile
index 70284d4..95055bf 100644
--- a/tests/buildbot/Makefile
+++ b/tests/buildbot/Makefile
@@ -3,7 +3,7 @@ default: checkdepends installtemplate
help:
@echo "read the Makefile to see available targets"
-checkdepends: /usr/bin/lxc-start /lib/bridge-utils /usr/bin/netmask
/usr/sbin/debootstrap /usr/sbin/rinse /usr/bin/yum /usr/sbin/tunctl
+checkdepends: /usr/bin/lxc-start /lib/bridge-utils /usr/bin/netmask
/usr/sbin/debootstrap /usr/sbin/rinse /usr/bin/yum
/usr/bin/lxc-start:
@[ -f $@ ] || apt-get install lxc
@@ -23,9 +23,6 @@ checkdepends: /usr/bin/lxc-start /lib/bridge-utils
/usr/bin/netmask /usr/sbin/de
/usr/bin/yum:
@[ -f $@ ] || apt-get install yum
-/usr/sbin/tunctl:
- @[ -f $@ ] || apt-get install uml-utilities
-
installtemplate: /usr/local/sbin/lxc-wrapper
/usr/local/sbin/lxc-wrapper: lxc-wrapper
diff --git a/tests/buildbot/fusionforge-func_tests.sh
b/tests/buildbot/fusionforge-func_tests.sh
index 38abba1..c120aa3 100755
--- a/tests/buildbot/fusionforge-func_tests.sh
+++ b/tests/buildbot/fusionforge-func_tests.sh
@@ -15,18 +15,17 @@ start_vm() {
# Destroy the VM if found
destroy_vm $1 || true
fi
-
sudo /usr/local/sbin/lxc-wrapper start $(basename $HOST .local)
-
+
echo "Waiting for $HOST to come up..."
i=0
- while [ $i -lt 10 ] && ! test_host ; do
+ # Done in this script rather than lxc-wrapper, because we have the SSH key
+ while [ $i -lt 10 ] && ! ssh -o 'StrictHostKeyChecking=no' root@$HOST
uname -a >/dev/null; do
sleep 10
i=$(($i+1))
echo -n .
done
-
- if test_host ; then
+ if [ $i -lt 10 ] ; then
echo " OK"
else
echo " FAIL"
@@ -34,10 +33,6 @@ start_vm() {
fi
}
-test_host () {
- ssh -o 'StrictHostKeyChecking=no' "root@$HOST" uname -a >/dev/null 2>&1
-}
-
stop_vm() {
HOST=$1
if ! $KEEPVM; then
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/Makefile | 5 +----
tests/buildbot/fusionforge-func_tests.sh | 13 ++++---------
2 files changed, 5 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
