From 00832dcbb5c12901068290ea9a4c42138b1ce045 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 23 Dec 2014 16:17:10 +0000 Subject: [PATCH 1/2] Ignore ssh know hosts for test vms --- test/.gitignore | 1 + test/config.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/.gitignore b/test/.gitignore index 0771c116..be2e5ea4 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,3 +1,4 @@ insecure_private_key assert.sh .vagrant +.ssh_known_hosts diff --git a/test/config.sh b/test/config.sh index 14febb6a..df0b2780 100644 --- a/test/config.sh +++ b/test/config.sh @@ -4,7 +4,7 @@ set -e . ./assert.sh -SSH=${SSH:-ssh -l vagrant -i ./insecure_private_key} +SSH=${SSH:-ssh -l vagrant -i ./insecure_private_key -o UserKnownHostsFile=./.ssh_known_hosts -o CheckHostIP=no -o StrictHostKeyChecking=no} HOST1=${HOST1:-192.168.48.19} HOST2=${HOST2:-192.168.48.15} From 859878c004ce63db2cdbd28eda89ac6fb1c92fc8 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 23 Dec 2014 16:17:38 +0000 Subject: [PATCH 2/2] Install latest Go toolchain on vagrant dev vms --- Vagrantfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c621d770..9ddc7499 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ VAGRANTFILE_API_VERSION = "2" vm_ip = "172.16.0.3" # arbitrary private IP -pkgs = "lxc-docker golang ethtool libpcap-dev git mercurial" +pkgs = "lxc-docker build-essential ethtool libpcap-dev git mercurial" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "phusion/ubuntu-14.04-amd64" @@ -14,14 +14,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provision :shell, :inline => "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9" config.vm.provision :shell, :inline => "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list" - pkg_cmd = "apt-get update -qq; " \ - "apt-get install -q -y --force-yes --no-install-recommends " - pkg_cmd << pkgs + pkg_cmd = "export DEBIAN_FRONTEND=noninteractive; " \ + "apt-get update -qq; " \ + "apt-get install -qq --no-install-recommends #{pkgs}" + + install_go_toolchain = "curl -s https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar xz -C /usr/local" + config.vm.provision :shell, :inline => pkg_cmd + config.vm.provision :shell, :inline => install_go_toolchain config.vm.provision :shell, :inline => "usermod -a -G docker vagrant; " config.vm.provision :shell, :inline => "echo export GOPATH=/home/vagrant >> /home/vagrant/.bashrc" + config.vm.provision :shell, :inline => "echo export PATH=/usr/local/go/bin:${PATH} >> /home/vagrant/.bashrc" config.vm.provision :shell, :inline => "chown -R vagrant:vagrant /home/vagrant/src" - config.vm.provision :shell, :inline => "sudo go install -a -tags netgo std" + config.vm.provision :shell, :inline => "/usr/local/go/bin/go clean -i net; /usr/local/go/bin/go install -tags netgo std" end