hs-test: fixed timed out tests passing in the CI

[vpp.git] / extras / vagrant / run.sh

diff --git a/extras/vagrant/run.sh b/extras/vagrant/run.sh
index 1cd3382..be2d842 100755 (executable)
--- a/extras/vagrant/run.sh
+++ b/extras/vagrant/run.sh
@@ -1,23 +1,23 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Figure out what system we are running on
-if [ -f /etc/lsb-release ];then
-    . /etc/lsb-release
-elif [ -f /etc/redhat-release ];then
-    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`
+if [ "$(uname)" <> "Darwin" ] ; then
+    OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+    OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 fi
 
-if [ $DISTRIB_ID == "CentOS" ]; then
+if [ "$OS_ID" == "ubuntu" ] ; then
+    $OS_CODENAME=$UBUNTU_CODENAME
+fi
+
+if [ "$OS_ID" == "centos" ] ; then
     # Install uio-pci-generic
-    modprobe uio_pci_generic
+    sudo -E modprobe uio_pci_generic
 fi
+
 echo "Starting VPP..."
-if [ $DISTRIB_ID == "Ubuntu" ] && [ $DISTRIB_CODENAME = "trusty" ] ; then
-    start vpp
+if [ "$OS_ID" == "ubuntu" ] && [ "$OS_CODENAME" == "trusty" ] ; then
+    sudo -E start vpp
 else
-    service vpp start
+    sudo -E service vpp start
 fi