From 5d3152cdc1c2bb64750d7b0684babe3f78102dbb Mon Sep 17 00:00:00 2001
From: Daniel Quackenbush <danquack@gmail.com>
Date: Sat, 21 Jul 2018 11:16:54 -0400
Subject: [PATCH] Updated Travis Config to use Ansible 2.6.1, Added build
 status in readme

---
 .travis.yml                    | 56 ++++++++++++++++++++++++++++------
 .travis/ansible_tests.sh       |  2 +-
 .travis/debops_common_tests.sh |  2 +-
 README.md                      |  6 +++-
 dev_requirements.txt           |  2 +-
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85bbc1e4..4aed8d0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,10 @@ matrix:
       env: MODE=debops_common VER=2.4.3.0
     # 2.5.5; 2.7 -> 2.7
     - python: "2.7"
-      env: MODE=debops_common VER=2.5.5
+      env: MODE=debops_common VER=2.6.1
     # 2.5.5; 3.6 -> 2.7
     - python: "3.6"
-      env: MODE=debops_common VER=2.5.5
+      env: MODE=debops_common VER=2.6.1
 
     # ansible_mitogen tests.
     # 2.4.3.0; Debian; 2.7 -> 2.7
@@ -59,22 +59,60 @@ matrix:
     # 2.5.5; Debian; 2.7 -> 2.7
     - python: "2.7"
       env: MODE=ansible VER=2.5.5 DISTRO=debian
-    # 2.5.5; CentOS; 2.7 -> 2.7
+    # 2.6.0; Debian; 2.7 -> 2.7
     - python: "2.7"
-      env: MODE=ansible VER=2.5.5 DISTRO=centos7
-    # 2.5.5; CentOS; 2.7 -> 2.6
+      env: MODE=ansible VER=2.6.0 DISTRO=debian
+    # 2.6.1; Debian; 2.7 -> 2.7
     - python: "2.7"
-      env: MODE=ansible VER=2.5.5 DISTRO=centos6
-    # 2.5.5; CentOS; 2.6 -> 2.7
+      env: MODE=ansible VER=2.6.1 DISTRO=debian
+
+   # Centos 7 Python2
+   # Latest
     - python: "2.6"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos7
+   # Backward Compatiability
+    - python: "2.7"
+      env: MODE=ansible VER=2.5.5 DISTRO=centos7
+    - python: "2.7"
+      env: MODE=ansible VER=2.6.0 DISTRO=centos7
+    - python: "2.7"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos7
+
+    # Centos 7 Python3
+    - python: "3.6"
       env: MODE=ansible VER=2.5.5 DISTRO=centos7
-    # 2.5.5; CentOS; 2.6 -> 2.6
+    - python: "3.6"
+      env: MODE=ansible VER=2.6.0 DISTRO=centos7
+    - python: "3.6"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos7
+
+
+    # Centos 6 Python2
+    # Latest
+    - python: "2.6"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos6
+    # Backward Compatiability
     - python: "2.6"
       env: MODE=ansible VER=2.5.5 DISTRO=centos6
-    # 2.5.5; Debian; 3.6 -> 2.7
+    - python: "2.6"
+      env: MODE=ansible VER=2.6.0 DISTRO=centos6
+    - python: "2.7"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos6
+
+    # Centos 6 Python3
     - python: "3.6"
       env: MODE=ansible VER=2.5.5 DISTRO=centos6
+    - python: "3.6"
+      env: MODE=ansible VER=2.6.0 DISTRO=centos6
+    - python: "3.6"
+      env: MODE=ansible VER=2.6.1 DISTRO=centos6
 
     # Sanity check our tests against vanilla Ansible, they should pass.
     - python: "2.7"
       env: MODE=ansible VER=2.5.5 DISTRO=debian STRATEGY=linear
+    - python: "2.7"
+      env: MODE=ansible VER=2.6.0 DISTRO=debian STRATEGY=linear
+    - python: "2.7"
+      env: MODE=ansible VER=2.6.1 DISTRO=debian STRATEGY=linear
+
+
diff --git a/.travis/ansible_tests.sh b/.travis/ansible_tests.sh
index 5c236521..a61ed836 100755
--- a/.travis/ansible_tests.sh
+++ b/.travis/ansible_tests.sh
@@ -3,7 +3,7 @@
 
 TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-`pwd`}"
 TMPDIR="/tmp/ansible-tests-$$"
-ANSIBLE_VERSION="${VER:-2.5.5}"
+ANSIBLE_VERSION="${VER:-2.6.1}"
 export ANSIBLE_STRATEGY="${STRATEGY:-mitogen_linear}"
 DISTRO="${DISTRO:-debian}"
 
diff --git a/.travis/debops_common_tests.sh b/.travis/debops_common_tests.sh
index f1909c10..ec4c1481 100755
--- a/.travis/debops_common_tests.sh
+++ b/.travis/debops_common_tests.sh
@@ -4,7 +4,7 @@
 TMPDIR="/tmp/debops-$$"
 TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-`pwd`}"
 TARGET_COUNT="${TARGET_COUNT:-2}"
-ANSIBLE_VERSION="${VER:-2.5.5}"
+ANSIBLE_VERSION="${VER:-2.6.1}"
 DISTRO=debian  # Naturally DebOps only supports Debian.
 
 export PYTHONPATH="${PYTHONPATH}:${TRAVIS_BUILD_DIR}"
diff --git a/README.md b/README.md
index 4fb3a588..2250f1b2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 
 # Mitogen
-
+<<<<<<< HEAD
+[![Build Status](https://travis-ci.org/dw/mitogen.png?branch=master)](https://travis-ci.org/{ORG-or-USERNAME}/{REPO-NAME})
+=======
+[![Build Status](https://travis-ci.org/{ORG-or-USERNAME}/{REPO-NAME}.png?branch=c%2B%2B11)](https://travis-ci.org/{ORG-or-USERNAME}/{REPO-NAME})
+>>>>>>> fcc10e644ee217743480940e4184a5bba1955487
 <a href="https://mitogen.readthedocs.io/">Please see the documentation</a>.
diff --git a/dev_requirements.txt b/dev_requirements.txt
index faa7dab9..7527504e 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,5 +1,5 @@
 -r docs/docs-requirements.txt
-ansible==2.5.5
+ansible==2.6.1
 coverage==4.5.1
 Django==1.6.11  # Last version supporting 2.6.
 mock==2.0.0