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.6.0 DISTRO=debian + # 2.6.1; Debian; 2.7 -> 2.7 + - python: "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 - # 2.5.5; CentOS; 2.7 -> 2.6 - python: "2.7" - env: MODE=ansible VER=2.5.5 DISTRO=centos6 - # 2.5.5; CentOS; 2.6 -> 2.7 - - python: "2.6" + 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..979afc66 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Mitogen - + Please see the documentation. 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 diff --git a/docs/ansible.rst b/docs/ansible.rst index e53ecf8e..b667fd37 100644 --- a/docs/ansible.rst +++ b/docs/ansible.rst @@ -58,7 +58,7 @@ Installation ------------ 1. Thoroughly review the :ref:`noteworthy_differences` and :ref:`changelog`. -2. Verify Ansible 2.3-2.5 and Python 2.6, 2.7 or 3.6 are listed in ``ansible +2. Verify Ansible 2.3-2.6.1 and Python 2.6, 2.7 or 3.6 are listed in ``ansible --version`` output. 3. Download and extract |mitogen_url| from PyPI. 4. Modify ``ansible.cfg``: @@ -130,12 +130,12 @@ Noteworthy Differences * The ``doas``, ``su`` and ``sudo`` become methods are available. File bugs to register interest in more. -* The `docker `_, - `jail `_, - `local `_, - `lxc `_, - `lxd `_, - and `ssh `_ +* The `docker `_, + `jail `_, + `local `_, + `lxc `_, + `lxd `_, + and `ssh `_ built-in connection types are supported, along with Mitogen-specific :ref:`machinectl `, :ref:`mitogen_doas< mitogen_doas>`, :ref:`mitogen_su `, :ref:`mitogen_sudo `, and :ref:`setns ` @@ -507,7 +507,7 @@ Docker ~~~~~~ Like `docker -`_ except +`_ except connection delegation is supported. * ``ansible_host``: Name of Docker container (default: inventory hostname). @@ -534,7 +534,7 @@ FreeBSD Jail ~~~~~~~~~~~~ Like `jail -`_ except +`_ except connection delegation is supported. * ``ansible_host``: Name of jail (default: inventory hostname). @@ -545,7 +545,7 @@ Local ~~~~~ Like `local -`_ except +`_ except connection delegation is supported. * ``ansible_python_interpreter`` @@ -556,8 +556,8 @@ connection delegation is supported. LXC ~~~ -Like `lxc `_ -and `lxd `_ +Like `lxc `_ +and `lxd `_ except connection delegation is supported, and ``lxc-attach`` is always used rather than the LXC Python bindings, as is usual with ``lxc``. @@ -646,7 +646,7 @@ When used as the ``mitogen_sudo`` connection method: SSH ~~~ -Like `ssh `_ +Like `ssh `_ except connection delegation is supported. * ``ansible_ssh_timeout``