aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-02-02 17:47:17 -0800
committerGerrit Code Review <gerrit@fd.io>2016-02-03 14:49:37 +0000
commiteeee9e2b1820ae1ca194ba0093d49519b66558f8 (patch)
tree6f1e1cbe26bd3cbef25c985acfb3b9328f941b70
parentc28b4745911de6834a89343f40c35cafab59a706 (diff)
Switched vagrant for ~/git/vpp to /vpp
build-root/vagrant/Vagrantfile was always mounting the vpp into /vpp Now rather than cloning it and building, we just use it as mounted. In order to let folks know what happened, a README.moved is copied into the ~/git/vpp so folks know what happened. In addition to make it easier for folks to do commits from withing the vagrant, we install git-review, and copy in the users .gitconfig and .gnupg directory. A couple of notes about this. VMWare goes much much faster in all cases. Virtualbox is a bit slower in the very first run (without ccache). One of the benefits of using the mounted /vpp though is that after your first vagrant up, you always have access to the .ccache, as it lives outside the vagrant, and so in steady state everything is faster. Change-Id: I2cd2c28181b3d7e664240dfe2249b5be3f1b9241 Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r--build-root/vagrant/README.moved5
-rw-r--r--build-root/vagrant/Vagrantfile16
-rw-r--r--build-root/vagrant/bootstrap.ubuntu1404.sh11
3 files changed, 25 insertions, 7 deletions
diff --git a/build-root/vagrant/README.moved b/build-root/vagrant/README.moved
new file mode 100644
index 00000000000..2bbf6564512
--- /dev/null
+++ b/build-root/vagrant/README.moved
@@ -0,0 +1,5 @@
+The location of the vpp code has moved from
+~/git/vpp
+To
+/vpp
+/vpp is a mount of the source code from outside the Vagrant, and should make it much easier to interact with the system.
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index f00233d632c..f4021659878 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -13,6 +13,22 @@ Vagrant.configure(2) do |config|
config.vm.provision 'shell', path: 'bootstrap.ubuntu1404.sh'
end
+ # Add .gnupg dir in so folks can sign patches
+ # Note, as gnupg puts socket files in that dir, we have
+ # to be cautious and make sure we are dealing with a plain file
+ homedir = File.expand_path("~/")
+ Dir["#{homedir}/.gnupg/**/*"].each do |fname|
+ if File.file?(fname)
+ destname = fname.sub(Regexp.escape("#{homedir}/"),'')
+ config.vm.provision "file", source: fname, destination: destname
+ end
+ end
+
+ # Copy in the .gitconfig if it exists
+ if File.file?(File.expand_path("~/.gitconfig"))
+ config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
+ end
+
# vagrant-cachier caches apt/yum etc to speed subsequent
# vagrant up
# to enable, run
diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh
index 35865faf8af..a8381bb4adc 100644
--- a/build-root/vagrant/bootstrap.ubuntu1404.sh
+++ b/build-root/vagrant/bootstrap.ubuntu1404.sh
@@ -10,7 +10,7 @@ apt-get upgrade -y
sudo update-alternatives --install /bin/sh sh /bin/bash 100
# Install build tools
-apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev
+apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev git-review
# Install other stuff
# apt-get install -y qemu-kvm libvirt-bin ubuntu-vm-builder bridge-utils
@@ -49,13 +49,10 @@ start hugepages
# Setup the vpp code
cd ~vagrant/
-sudo -u vagrant mkdir git
-cd git/
+sudo -u vagrant mkdir -p git/vpp
+cp /vagrant/README.moved git/vpp/
-# Check if git exists and remove it before attempting clone, else clone ineffective when "reload --provision"
-[ -d vpp ] && rm -rf vpp
-sudo -H -u vagrant git clone /vpp
-cd vpp/
+cd /vpp/
# Initial vpp build
if [ -d build-root ]; then