diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-01 20:33:53 -0500 |
|---|---|---|
| committer |   Damjan Marion <damarion@cisco.com> | 2016-05-02 19:25:44 +0000 |
| commit | efa7f9e6c2ee9fc68e87fb2cddd5f82842c4330e (patch) | |
| tree | 9762795599ca516a0c29116aa02bc6e7a1a6ed12 | |
| parent | 3d5916dee601311c264a4aa1b24a6eeb9e36c58f (diff) | |
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 <eaw@cisco.com>
| -rw-r--r-- | build-root/vagrant/Vagrantfile | 1 | ||||
| -rwxr-xr-x | build-root/vagrant/build.sh | 2 | ||||
| -rw-r--r-- | build-root/vagrant/install.sh | 30 |
3 files changed, 31 insertions, 2 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index 71b47686bdb..4c720de678c 100644 --- 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 b608b853397..45a7eb4d336 100755 --- 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 index 00000000000..a53faa4dd73 --- /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 |