commit 0167d58064af56b830ebe278fec551ea7eeff7ef
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 19:22:08 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Sep 10 13:19:13 2016 -0700
tree 3bb6a188723f254a8d0611b1ca7479a5a462fe27
parent 03361aa56d8971c06d47d4a915472a9bba617908

docs+ci: Remove support for 12.04 and switch to Ubuntu 14.04 with Travis-CI builds

Change-Id: Id7020b73ce2505565fa5f084d8ebeb6bfc9a2c42

.jenkins.d/01-deps.sh

diff --git a/.jenkins.d/01-deps.sh b/.jenkins.d/01-deps.sh
index 9d49b08..204336f 100755
--- a/.jenkins.d/01-deps.sh
+++ b/.jenkins.d/01-deps.sh
@@ -17,18 +17,7 @@
     set -x
     sudo apt-get update -qq -y
     sudo apt-get -qq -y install build-essential
-    sudo apt-get -qq -y install libssl-dev libsqlite3-dev libcrypto++-dev
-
-    if has Ubuntu-12.04 $NODE_LABELS; then
-        sudo apt-get install -qq -y python-software-properties
-        sudo add-apt-repository -y ppa:boost-latest/ppa
-        sudo apt-get update -qq -y
-        sudo apt-get install -qq -y libboost1.55-all-dev
-        sudo apt-get install -qq -y python-gnomedesktop
-    else
-        sudo apt-get install -qq -y libboost-all-dev
-    fi
-
+    sudo apt-get -qq -y install libssl-dev libsqlite3-dev libcrypto++-dev libboost-all-dev
     sudo apt-get install -qq -y python-setuptools python-dev python-pygraphviz python-kiwi
     sudo apt-get install -qq -y python-pygoocanvas python-gnome2
     sudo apt-get install -qq -y python-rsvg ipython

.jenkins.d/10-build.sh

diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index b0ec560..8af1fc4 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -13,10 +13,6 @@
 sudo rm -Rf build/ .waf-1* .waf3-1*
 find . -name '*.pyc' | sudo xargs rm -f
 
-if has Ubuntu-12.04 $NODE_LABELS; then
-    EXTRA_FLAGS=" --boost-libs=/usr/lib/x86_64-linux-gnu"
-fi
-
 # Configure/build in debug mode
 ./waf -j1 configure -d debug --enable-modules=ndnSIM --enable-examples --enable-tests $EXTRA_FLAGS
 ./waf -j1 build