From cab4a7e1eec7744bf62407045e77cd86fb6ca5e0 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Sun, 5 Jul 2015 18:59:53 +0100 Subject: [PATCH 1/2] Explain how to create the test VMs from vagrant --- test/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/README.md b/test/README.md index 9d7cbdc7..9155dff0 100644 --- a/test/README.md +++ b/test/README.md @@ -6,8 +6,13 @@ You need two VMs with docker >=1.3.1 installed and listening on TCP port 2375 (see below). You also need to be able to ssh to these VMs, preferably without having to input anything. -The `Vagrantfile` in this directory constructs two such VMs. To meet -the aforementioned ssh requirement you may want to +The `Vagrantfile` in this directory constructs two such VMs. + +To create the VMs, open a shell and in this directory and type + + vagrant up + +To meet the aforementioned ssh requirement you may want to cp ~/.vagrant.d/insecure_private_key . From e86d255a47a3511701436784c275ceec9ecabbad Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Mon, 6 Jul 2015 10:02:47 +0100 Subject: [PATCH 2/2] Add comment about running integration tests from the Vagrant build VM --- test/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/README.md b/test/README.md index 9155dff0..4e18f175 100644 --- a/test/README.md +++ b/test/README.md @@ -18,6 +18,9 @@ To meet the aforementioned ssh requirement you may want to ## Running tests +If you are [building weave using Vagrant](http://docs.weave.works/weave/latest_release/building.html), +it is recommended to run the tests from the build VM and not the host. + ./setup.sh uploads the weave images from where the Makefile puts them