Merge pull request #7400 from Icinga/bugfix/cib-stats-concurrent-checks

[icinga2] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6963d0514864519f6a34fb076eda65b9d32193c8..03f43f032dce677788dd1b2904b95b36b1a16188 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,42 @@
-dist: trusty
+dist: xenial
 sudo: false
 
 language: cpp
 
 cache: ccache
 
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "eOnFdiRhB7VUZY7Of4Ff0px93HRWGcD4fXCPiy8V2OC2ER98CYCVw7PKt2Is6i/yTveFTps1kObOo0T03aUT8y/xeBy/wMuJYk1d6mVgmSXOjxcxjQVTUh4J+xB+k/R6FoP2dirNDbvSayCj9Fi9toN9hQHMM8oAZOZfiKmYTJc="
-
-before_install:
-      - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
-
 addons:
-  apt_packages:
-    - libboost-all-dev
-    - flex
-    - bison
-    - libssl-dev
-    - libpq-dev
-    - libmysqlclient-dev
-    - libedit-dev
-    - libyajl-dev
-    - libwxbase3.0-dev
-    - libwxgtk3.0-dev
-  coverity_scan:
-    project:
-      name: "Icinga/icinga2"
-    notification_email: icinga2@icinga.com
-    build_command_prepend: "cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/tmp/icinga2 -DICINGA2_PLUGINDIR=/tmp/icinga2/sbin -DICINGA2_UNITY_BUILD=ON"
-    build_command: "make -j 2"
-    branch_pattern: coverity_scan
-
+  apt:
+    sources:
+      - sourceline: 'deb http://packages.icinga.com/ubuntu icinga-xenial main'
+        key_url: 'https://packages.icinga.com/icinga.key'
+    packages:
+      - libboost1.67-icinga-all-dev
+      - flex
+      - bison
+      - libssl-dev
+      - libpq-dev
+      - libmysqlclient-dev
+      - libedit-dev
 before_script:
-  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then
-      mkdir build &&
-      cd build &&
-      cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/tmp/icinga2 -DICINGA2_PLUGINDIR=/tmp/icinga2/sbin;
-    fi
+  - arch=$(uname -m)
+  - mkdir build
+  - cd build
+  - >
+    cmake ..
+    -DCMAKE_BUILD_TYPE=Debug
+    -DICINGA2_UNITY_BUILD=Off
+    -DCMAKE_INSTALL_PREFIX=/tmp/icinga2
+    -DICINGA2_PLUGINDIR=/tmp/icinga2/sbin
+    -DBoost_NO_BOOST_CMAKE=TRUE
+    -DBoost_NO_SYSTEM_PATHS=TRUE
+    -DBOOST_LIBRARYDIR=/usr/lib/${arch}-linux-gnu/icinga-boost
+    -DBOOST_INCLUDEDIR=/usr/include/icinga-boost
+    -DCMAKE_INSTALL_RPATH=/usr/lib/${arch}-linux-gnu/icinga-boost
 
 script:
-  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then
-      make &&
-      make test &&
-      make install &&
-      /tmp/icinga2/sbin/icinga2 --version &&
-      /tmp/icinga2/sbin/icinga2 daemon -C -DRunAsUser=$(id -u -n) -DRunAsGroup=$(id -g -n);
-    fi
+  - make
+  - make test
+  - make install
+  - /tmp/icinga2/sbin/icinga2 --version
+  - /tmp/icinga2/sbin/icinga2 daemon -C -DRunAsUser=$(id -u -n) -DRunAsGroup=$(id -g -n)