Travis mac build (#761)

* split travis steps on multiple scripts * cleanup * mac os build files * adding mac to os list in travis yaml file * install_if_not_present * compile flags and tests * make script compatible with osx * install coreutils * temp remove linux for faster iteration * debug * verbose debug * Regression tests are failing on Mac build #614 * uncomment rm * revert -pc and fix topports_server script #614 * enable linux * report dev changes for linux build to this branch
draios · Mar 20, 2017 · b6073e6 · b6073e6
1 parent 9062922
commit b6073e6
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 68 deletions.
diff --git a/.travis-scripts/linux/before_install.sh b/.travis-scripts/linux/before_install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get update
diff --git a/.travis-scripts/linux/build.sh b/.travis-scripts/linux/build.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+export CC="gcc-4.8"
+export CXX="g++-4.8"
+wget https://s3.amazonaws.com/download.draios.com/dependencies/cmake-3.3.2.tar.gz
+tar -xzf cmake-3.3.2.tar.gz
+cd cmake-3.3.2
+./bootstrap --prefix=/usr
+make
+sudo make install
+cd ..
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+make VERBOSE=1
+make package
+cd ..
+test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
+rm -rf build
+pushd $(mktemp -d --tmpdir sysdig.XXXXXXXXXX)
+wget http://download.draios.com/dependencies/zlib-1.2.8.tar.gz
+tar -xzf zlib-1.2.8.tar.gz
+cd zlib-1.2.8
+./configure
+make
+sudo make install
+cd ..
+wget https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.tar.gz
+tar zxvf 0.10.5.tar.gz
+cd jsoncpp-0.10.5
+cmake -DBUILD_SHARED_LIBS=ON .
+make
+sudo make install
+cd ..
+wget https://s3.amazonaws.com/download.draios.com/dependencies/libb64-1.2.src.zip
+unzip libb64-1.2.src.zip
+cd libb64-1.2
+make
+sudo cp -r include/* /usr/local/include/
+sudo cp src/libb64.a /usr/local/lib/
+cd ..
+wget http://download.draios.com/dependencies/jq-1.5.tar.gz
+tar -xzf jq-1.5.tar.gz
+cd jq-1.5
+./configure --disable-maintainer-mode
+make LDFLAGS=-all-static
+sudo cp ./jq.h /usr/local/include/
+sudo cp ./jv.h /usr/local/include/
+sudo cp .libs/libjq.a /usr/local/lib/
+cd ..
+popd
+rm -rf userspace/libsinsp/third-party/jsoncpp
+sudo apt-get install libncurses5-dev libluajit-5.1-dev libcurl4-openssl-dev libssl-dev
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_DEPS=OFF
+make VERBOSE=1
+make package
+cd ..
+test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
diff --git a/.travis-scripts/linux/install.sh b/.travis-scripts/linux/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+sudo apt-get --force-yes install g++-4.8
+sudo apt-get install rpm linux-headers-$(uname -r)
+sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
diff --git a/.travis-scripts/osx/before_install.sh b/.travis-scripts/osx/before_install.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+brew update
diff --git a/.travis-scripts/osx/build.sh b/.travis-scripts/osx/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF
+make install
+../test/sysdig_trace_regression.sh $(which sysdig) ./userspace/sysdig/chisels $TRAVIS_BRANCH
diff --git a/.travis-scripts/osx/install.sh b/.travis-scripts/osx/install.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+function install_if_not_present(){
+	brew ls | grep ${1}
+	if [[ ${?} -ne 0 ]]; then
+		brew install ${1}
+	else
+		echo "dependency ${1} already installed"
+	fi
+}
+install_if_not_present "cmake"
+install_if_not_present "luajit"
+install_if_not_present "coreutils"
diff --git a/.travis.yml b/.travis.yml
@@ -1,76 +1,18 @@
 language: c
+os:
+    - linux
+    - osx
 env:
     - BUILD_TYPE=Debug
     - BUILD_TYPE=Release
 before_install:
-    - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get update
+    - .travis-scripts/${TRAVIS_OS_NAME}/before_install.sh
 install:
-    - sudo apt-get --force-yes install g++-4.8
-    - sudo apt-get install rpm linux-headers-$(uname -r)
-    - sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
+    - .travis-scripts/${TRAVIS_OS_NAME}/install.sh
 before_script:
     - export KERNELDIR=/lib/modules/$(ls /lib/modules | sort | head -1)/build
 script:
-    - set -e
-    - export CC="gcc-4.8"
-    - export CXX="g++-4.8"
-    - wget https://s3.amazonaws.com/download.draios.com/dependencies/cmake-3.3.2.tar.gz
-    - tar -xzf cmake-3.3.2.tar.gz
-    - cd cmake-3.3.2
-    - ./bootstrap --prefix=/usr
-    - make
-    - sudo make install
-    - cd ..
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-    - make VERBOSE=1
-    - make package
-    - cd ..
-    - test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
-    - rm -rf build
-    - pushd $(mktemp -d --tmpdir sysdig.XXXXXXXXXX)
-    - wget http://download.draios.com/dependencies/zlib-1.2.8.tar.gz
-    - tar -xzf zlib-1.2.8.tar.gz
-    - cd zlib-1.2.8
-    - ./configure
-    - make
-    - sudo make install
-    - cd ..
-    - wget https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.tar.gz
-    - tar zxvf 0.10.5.tar.gz
-    - cd jsoncpp-0.10.5
-    - cmake -DBUILD_SHARED_LIBS=ON .
-    - make
-    - sudo make install
-    - cd ..
-    - wget https://s3.amazonaws.com/download.draios.com/dependencies/libb64-1.2.src.zip
-    - unzip libb64-1.2.src.zip
-    - cd libb64-1.2
-    - make
-    - sudo cp -r include/* /usr/local/include/
-    - sudo cp src/libb64.a /usr/local/lib/
-    - cd ..
-    - wget http://download.draios.com/dependencies/jq-1.5.tar.gz
-    - tar -xzf jq-1.5.tar.gz
-    - cd jq-1.5
-    - ./configure --disable-maintainer-mode
-    - make LDFLAGS=-all-static
-    - sudo cp ./jq.h /usr/local/include/
-    - sudo cp ./jv.h /usr/local/include/
-    - sudo cp .libs/libjq.a /usr/local/lib/
-    - cd ..
-    - popd
-    - rm -rf userspace/libsinsp/third-party/jsoncpp
-    - sudo apt-get install libncurses5-dev libluajit-5.1-dev libcurl4-openssl-dev libssl-dev
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_DEPS=OFF
-    - make VERBOSE=1
-    - make package
-    - cd ..
-    - test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
+    - .travis-scripts/${TRAVIS_OS_NAME}/build.sh
 notifications:
   webhooks:
     urls:

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
@@ -1,12 +1,19 @@
 #!/bin/bash
-set -eu
+set -exu
 
-SCRIPT=$(readlink -f $0)
-BASEDIR=$(dirname $SCRIPT)
+unamestr=`uname`
+if [[ "$unamestr" == 'Linux' ]]; then
+    SCRIPT=$(readlink -f $0)
+    TMPBASE=${4:-$(mktemp -d --tmpdir sysdig.XXXXXXXXXX)}
+elif [[ "$unamestr" == 'Darwin' ]]; then
+	SCRIPT=$(greadlink -f $0)
+	unset TMPDIR #make shure that mktemp on mac will generate the folder under /tmp
+    TMPBASE=${4:-$(mktemp -d -t sysdig)}
+fi
 
+BASEDIR=$(dirname $SCRIPT)
 SYSDIG=$1
 CHISELS=$2
-TMPBASE=${4:-$(mktemp -d --tmpdir sysdig.XXXXXXXXXX)}
 TRACEDIR="${TMPBASE}/traces"
 RESULTDIR="${TMPBASE}/results"
 BASELINEDIR="${TMPBASE}/baseline"