From 2fdcaa218f4c1615fc6f32beef338b48401f5b74 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 21 Mar 2016 12:58:12 -0400
Subject: [PATCH] Pulling in travis.yml from devel

---
 .travis.yml | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 603132f722c..83fd3673dfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,25 @@
-sudo: false
+dist: trusty
+sudo: required
+services:
+  - docker
 language: python
 matrix:
   include:
-    - env: TOXENV=py24 INTEGRATION=no
-    - env: TOXENV=py26 INTEGRATION=yes
+    - env: TARGET=sanity TOXENV=py24
+    - env: TARGET=sanity TOXENV=py26
       python: 2.6
-    - env: TOXENV=py27 INTEGRATION=yes
+    - env: TARGET=sanity TOXENV=py27
       python: 2.7
-    - env: TOXENV=py34 INTEGRATION=no
+    - env: TARGET=sanity TOXENV=py34
       python: 3.4
-    - env: TOXENV=py35 INTEGRATION=no
+    - env: TARGET=sanity TOXENV=py35
       python: 3.5
+    - env: TARGET=centos6
+    - env: TARGET=centos7 TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - env: TARGET=fedora23 TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - env: TARGET=fedora-rawhide TARGET_OPTIONS="--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - env: TARGET=ubuntu1204
+    - env: TARGET=ubuntu1404
 addons:
   apt:
     sources:
@@ -18,16 +27,16 @@ addons:
     packages:
       - python2.4
 install:
-  - pip install tox PyYAML Jinja2 sphinx
+  - pip install tox coveralls
 script:
-# urllib2's defaults are not secure enough for us
-- ./test/code-smell/replace-urlopen.sh .
-- ./test/code-smell/use-compat-six.sh lib
-- ./test/code-smell/boilerplate.sh
-- ./test/code-smell/required-and-default-attributes.sh
-- if test x"$TOXENV" != x'py24' ; then tox ; fi
-- if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
-  #- make -C docsite all
-- if test x"$INTEGRATION" = x'yes' ; then source ./hacking/env-setup && cd test/integration/ && make parsing && make test_var_precedence && make unicode ; fi
+  - ./test/utils/run_tests.sh
 after_success:
   - coveralls
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#ansible-notices"
+    on_success: change
+    on_failure: always
+    skip_join: true
+    nick: ansibletravis