Break out install.sh from build.sh

This is necessary because we are now using
build.sh for CI... and we shouldn't
install packages on CI boxes.

Change-Id: I68f7880dfc75bbc4aa278ab0765a43e3fb899f3d
Signed-off-by: Ed Warnicke <[email protected]>

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 71b4768..4c720de 100644 (file)
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -13,6 +13,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision :shell, :path => "update.sh"
   config.vm.provision :shell, :path => "build.sh", :args => "/vpp vagrant"
+  config.vm.provision :shell, :path => "install.sh", :args => "/vpp"
   config.vm.provision :shell, :path => "clearinterfaces.sh"
   config.vm.provision :shell, :path => "run.sh"
 

diff --git a/build-root/vagrant/build.sh b/build-root/vagrant/build.sh
index b608b85..45a7eb4 100755 (executable)
--- a/build-root/vagrant/build.sh
+++ b/build-root/vagrant/build.sh
@@ -46,9 +46,7 @@ rm -f build-root/.bootstrap.ok
 $SUDOCMD make bootstrap
 if [ $DISTRIB_ID == "Ubuntu" ]; then
     $SUDOCMD make pkg-deb
-    (cd build-root/;sudo dpkg -i *.deb)
 elif [ $DISTRIB_ID == "CentOS" ]; then
     $SUDOCMD make pkg-rpm
-    (cd build-root/;sudo rpm -Uvh *.rpm)
 fi
 

diff --git a/build-root/vagrant/install.sh b/build-root/vagrant/install.sh
new file mode 100644 (file)
index 0000000..a53faa4
--- /dev/null
+++ b/build-root/vagrant/install.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Get Command Line arguements if present
+VPP_DIR=$1
+if [ "x$1" != "x" ]; then
+    VPP_DIR=$1
+else
+    VPP_DIR=`dirname $0`/../../
+fi
+
+# Figure out what system we are running on
+if [ -f /etc/lsb-release ];then
+    . /etc/lsb-release
+elif [ -f /etc/redhat-release ];then
+    sudo yum install -y redhat-lsb
+    DISTRIB_ID=`lsb_release -si`
+    DISTRIB_RELEASE=`lsb_release -sr`
+    DISTRIB_CODENAME=`lsb_release -sc`
+    DISTRIB_DESCRIPTION=`lsb_release -sd`
+fi
+echo DISTRIB_ID: $DISTRIB_ID
+echo DISTRIB_RELEASE: $DISTRIB_RELEASE
+echo DISTRIB_CODENAME: $DISTRIB_CODENAME
+echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
+
+if [ $DISTRIB_ID == "Ubuntu" ]; then
+    (cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb)
+elif [ $DISTRIB_ID == "CentOS" ]; then
+    (cd ${VPP_DIR}/build-root/;sudo rpm -Uvh *.rpm)
+fi
\ No newline at end of file