From 880b0a883a4b134142a624f8a59f50d0802908ad Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Wed, 26 Oct 2016 11:07:14 +0100
Subject: [PATCH 1/5] Use vendoring when building test runner

---
 Makefile          | 2 +-
 vagrant-common.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 69e0dc59..fe19f732 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ tools/.git:
 	git submodule update --init
 
 $(RUNNER_EXE): tools/.git
-	make -C tools/runner
+	GO15VENDOREXPERIMENT=1 make -C tools/runner
 
 $(PUBLISH): publish_%: $(IMAGES_UPTODATE)
 	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag  $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
diff --git a/vagrant-common.rb b/vagrant-common.rb
index d54127fb..704d024e 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -1,4 +1,4 @@
-$go_version = "1.4.2"
+$go_version = "1.5.2"
 
 $go_path = "/usr/local/go/bin"
 

From 1c4a01d52c0c2986e08454afad5d6ed2177fcf52 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Oct 2016 11:16:11 +0100
Subject: [PATCH 2/5] Read Go version from Dockerfile in order to keep things
 'DRY'.

---
 vagrant-common.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vagrant-common.rb b/vagrant-common.rb
index 704d024e..9c0c6b5b 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -1,4 +1,8 @@
-$go_version = "1.5.2"
+$go_regexp = /FROM golang:(\S*).*?/
+$go_version = File.readlines("build/Dockerfile").first { |line| line.match($go_regexp) }.match($go_regexp).captures.first
+if $go_version.nil?
+  raise ArgumentError.new("Failed to read Go version from Dockerfile.")
+end
 
 $go_path = "/usr/local/go/bin"
 

From c801409c946eb2de98ed8a6927f809333bbad894 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Oct 2016 11:28:05 +0100
Subject: [PATCH 3/5] Set VM's memory to 2048 MB by default.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 54f0a895..95e20761 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,6 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.network "private_network", ip: vm_ip
   config.vm.provider :virtualbox do |vb|
+    vb.memory = 2048
     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
     vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
   end

From 4839f418091becf145d699507fe6fa33cf197125 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Oct 2016 12:23:58 +0100
Subject: [PATCH 4/5] Improve resolution of Dockerfile since used in both
 Vagrantfile and test/Vagrantfile.

---
 vagrant-common.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vagrant-common.rb b/vagrant-common.rb
index 9c0c6b5b..125abeea 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -1,5 +1,6 @@
 $go_regexp = /FROM golang:(\S*).*?/
-$go_version = File.readlines("build/Dockerfile").first { |line| line.match($go_regexp) }.match($go_regexp).captures.first
+$dockerfile_path = File.expand_path(File.join(File.dirname(__FILE__), 'build', 'Dockerfile'))
+$go_version = File.readlines($dockerfile_path).first { |line| line.match($go_regexp) }.match($go_regexp).captures.first
 if $go_version.nil?
   raise ArgumentError.new("Failed to read Go version from Dockerfile.")
 end

From d893f448339d7ff1a3f3b4d6a259fbb11cd9efa6 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Oct 2016 16:01:36 +0100
Subject: [PATCH 5/5] Vagrantfile now copies SSH key required to run smoke
 tests from host to guest.

---
 Vagrantfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 95e20761..5e636d2b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,6 +30,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder ".", "/home/vagrant/src/github.com/weaveworks/weave"
 
+  # Set SSH keys up to be able to run smoke tests straightaway:
+  config.vm.provision "file", source: "~/.vagrant.d/insecure_private_key", destination: "/home/vagrant/src/github.com/weaveworks/weave/test/insecure_private_key"
+
   install_build_deps config.vm, pkgs
   install_go_toochain config.vm
   tweak_user_env config.vm