Adopts Ansible 2.9 as supported (#2301)

* Adds Ansible 2.9 to supported list * Drops Ansible 2.6 from supported list Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
ansible · Sep 17, 2019 · baf7e27 · baf7e27
1 parent 765fc9e
commit baf7e27
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -96,6 +96,11 @@ jobs:
       env:
         - TOXENV=check,build-docker
 
+    - <<: *py-37
+      env:
+        - TOXENV=ansible29-unit
+      name: unit tests, Ansible 2.9, Python 3.7
+
     - <<: *py-37
       env:
         - TOXENV=ansible28-unit
@@ -106,10 +111,11 @@ jobs:
         - TOXENV=ansible27-unit
       name: unit tests, Ansible 2.7, Python 3.7
 
-    - <<: *py-37
+    - <<: *py-36
+      <<: *if-cron-or-manual-run-or-tagged
       env:
-        - TOXENV=ansible26-unit
-      name: unit tests, Ansible 2.6, Python 3.7
+        - TOXENV=ansible29-unit
+      name: unit tests, Ansible 2.9, Python 3.6
 
     - <<: *py-36
       <<: *if-cron-or-manual-run-or-tagged
@@ -123,11 +129,10 @@ jobs:
         - TOXENV=ansible27-unit
       name: unit tests, Ansible 2.7, Python 3.6
 
-    - <<: *py-36
-      <<: *if-cron-or-manual-run-or-tagged
+    - <<: *py-27
       env:
-        - TOXENV=ansible26-unit
-      name: unit tests, Ansible 2.6, Python 3.6
+        - TOXENV=ansible29-unit
+      name: unit tests, Ansible 2.9, Python 2.7
 
     - <<: *py-27
       env:
@@ -139,18 +144,25 @@ jobs:
         - TOXENV=ansible27-unit
       name: unit tests, Ansible 2.7, Python 2.7
 
-    - <<: *py-27
-      env:
-        - TOXENV=ansible26-unit
-      name: unit tests, Ansible 2.6, Python 2.7
-
     # Note(decentral1se): we temporarily only run Hetzner Cloud functional
     # tests on this job so that we get at least some guarantee on testing When
     # we have more CI resources, we will migrate away from this stop-gap
     # solution
     - <<: *py-37
       env:
         - HCLOUD_TOKEN="$(./contrib/tokenmgmr.py get --driver hetznercloud)"
+        - PYTEST_ADDOPTS='-m shard_1_of_2'
+        - TOXENV=ansible29-functional
+      name: functional tests shard 1, Ansible 2.9, Python 3.7
+
+    - <<: *py-37
+      env:
+        - PYTEST_ADDOPTS='-m shard_2_of_2'
+        - TOXENV=ansible29-functional
+      name: functional tests shard 2, Ansible 2.9, Python 3.7
+
+    - <<: *py-37
+      env:
         - PYTEST_ADDOPTS='-m shard_1_of_2'
         - TOXENV=ansible28-functional
       name: functional tests shard 1, Ansible 2.8, Python 3.7
@@ -173,17 +185,19 @@ jobs:
         - TOXENV=ansible27-functional
       name: functional tests shard 2, Ansible 2.7, Python 3.7
 
-    - <<: *py-37
+    - <<: *py-36
+      <<: *if-cron-or-manual-run-or-tagged
       env:
         - PYTEST_ADDOPTS='-m shard_1_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 1, Ansible 2.6, Python 3.7
+        - TOXENV=ansible27-functional
+      name: functional tests shard 1, Ansible 2.7, Python 3.6
 
-    - <<: *py-37
+    - <<: *py-36
+      <<: *if-cron-or-manual-run-or-tagged
       env:
         - PYTEST_ADDOPTS='-m shard_2_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 2, Ansible 2.6, Python 3.7
+        - TOXENV=ansible27-functional
+      name: functional tests shard 2, Ansible 2.7, Python 3.6
 
     - <<: *py-36
       <<: *if-cron-or-manual-run-or-tagged
@@ -213,19 +227,17 @@ jobs:
         - TOXENV=ansible27-functional
       name: functional tests shard 2, Ansible 2.7, Python 3.6
 
-    - <<: *py-36
-      <<: *if-cron-or-manual-run-or-tagged
+    - <<: *py-27
       env:
         - PYTEST_ADDOPTS='-m shard_1_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 1, Ansible 2.6, Python 3.6
+        - TOXENV=ansible29-functional
+      name: functional tests shard 1, Ansible 2.9, Python 2.7
 
-    - <<: *py-36
-      <<: *if-cron-or-manual-run-or-tagged
+    - <<: *py-27
       env:
         - PYTEST_ADDOPTS='-m shard_2_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 2, Ansible 2.6, Python 3.6
+        - TOXENV=ansible29-functional
+      name: functional tests shard 2, Ansible 2.9, Python 2.7
 
     - <<: *py-27
       env:
@@ -251,18 +263,6 @@ jobs:
         - TOXENV=ansible27-functional
       name: functional tests shard 2, Ansible 2.7, Python 2.7
 
-    - <<: *py-27
-      env:
-        - PYTEST_ADDOPTS='-m shard_1_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 1, Ansible 2.6, Python 2.7
-
-    - <<: *py-27
-      env:
-        - PYTEST_ADDOPTS='-m shard_2_of_2'
-        - TOXENV=ansible26-functional
-      name: functional tests shard 2, Ansible 2.6, Python 2.7
-
     # The following set of jobs is running tests against devel branch
     # of ansible/ansible:
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,7 @@ History
 Unreleased
 ==========
 
+* Supported Ansible versions are now 2.9, 2.8, 2.7
 * The Linode driver now uses the ``linode_v4`` module.
 * Removed goss verifier
 * ``molecule dependency`` now has a retry and timed back-off by default for flaky network connections.

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ minversion = 3.9.0
 envlist =
     lint
     check
-    py{27,35,36,37}-ansible{25,26,27,28}-{functional,unit}
+    py{27,35,36,37}-ansible{27,28,29}-{functional,unit}
     doc
 skipdist = True
 skip_missing_interpreters = True
@@ -24,10 +24,9 @@ setenv =
     unit: PYTEST_ADDOPTS=molecule/test/unit/ --cov={toxinidir}/molecule/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto}
     functional: PYTEST_ADDOPTS=molecule/test/functional/ {env:PYTEST_ADDOPTS:}
 deps =
-    ansible25: ansible>=2.5,<2.6
-    ansible26: ansible>=2.6,<2.7
     ansible27: ansible>=2.7,<2.8
     ansible28: ansible>=2.8,<2.9
+    ansible29: ansible>=2.9.0b1,<2.10
     ansibledevel: git+https://github.com/ansible/ansible.git
 extras =
     docker