Merge "Support ansible 2.6"

tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml

@@ -35,6 +35,14 @@
       test_ansible_version_major: 2
       test_ansible_version_minor: 5
 
+- job:
+    name: ansible-26
+    parent: ansible-version
+    ansible-version: 2.6
+    vars:
+      test_ansible_version_major: 2
+      test_ansible_version_minor: 6
+
 
 - project:
     name: common-config
@@ -42,3 +50,4 @@
       jobs:
         - ansible-default
         - ansible-25
+        - ansible-26

tests/remote/test_remote_action_modules.py

@@ -211,3 +211,7 @@ class TestActionModules25(AnsibleZuulTestCase):
         self._run_job('known-hosts-localhost', 'SUCCESS')
 
         self._run_job('known-hosts-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE)
+
+
+class TestActionModules26(TestActionModules25):
+    ansible_version = '2.6'

tests/remote/test_remote_zuul_json.py

@@ -142,3 +142,7 @@ class TestZuulJSON25(AnsibleZuulTestCase):
             dateutil.parser.parse(task_end_time)
             dateutil.parser.parse(play_start_time)
             dateutil.parser.parse(play_end_time)
+
+
+class TestZuulJSON26(TestZuulJSON25):
+    ansible_version = '2.6'

tests/remote/test_remote_zuul_stream.py

@@ -166,3 +166,7 @@ class TestZuulStream25(AnsibleZuulTestCase):
             self.assertLogLine(r'TASK \[Module failure\]', text)
             self.assertLogLine(
                 r'controller \| MODULE FAILURE: This module is broken', text)
+
+
+class TestZuulStream26(TestZuulStream25):
+    ansible_version = '2.6'

tests/unit/test_v3.py

@@ -2439,6 +2439,10 @@ class TestAnsible25(AnsibleZuulTestCase):
         # getting the exception we expect.
 
 
+class TestAnsible26(TestAnsible25):
+    ansible_version = '2.6'
+
+
 class TestPrePlaybooks(AnsibleZuulTestCase):
     # A temporary class to hold new tests while others are disabled
 
@@ -5315,4 +5319,5 @@ class TestAnsibleVersion(AnsibleZuulTestCase):
         self.assertHistory([
             dict(name='ansible-default', result='SUCCESS', changes='1,1'),
             dict(name='ansible-25', result='SUCCESS', changes='1,1'),
+            dict(name='ansible-26', result='SUCCESS', changes='1,1'),
         ], ordered=False)