Remove support for ansible 2.5

With release 2.8 Ansible has dropped support for version 2.5 as it is
EOL.

Change-Id: I0a43b1b9d94925f3b6e7266434fb698e665dd42c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

.zuul.yaml

@@ -27,15 +27,6 @@
       - zuul/lib/ansible*
       - playbooks/zuul-stream/.*
 
-- job:
-    name: zuul-stream-functional-2.5
-    parent: zuul-stream-functional
-    # Force executor to use same Ansible version as "controller" node so
-    # that the inventory.yaml file will be correct for that version.
-    ansible-version: 2.5
-    vars:
-      zuul_ansible_version: 2.5
-
 - job:
     name: zuul-stream-functional-2.6
     parent: zuul-stream-functional
@@ -227,7 +218,6 @@
             success-url: 'npm/reports/bundle.html'
             files:
               - web/.*
-        - zuul-stream-functional-2.5
         - zuul-stream-functional-2.6
         - zuul-stream-functional-2.7
         - zuul-stream-functional-2.8
@@ -273,7 +263,6 @@
             success-url: 'npm/reports/bundle.html'
             files:
               - web/.*
-        - zuul-stream-functional-2.5
         - zuul-stream-functional-2.6
         - zuul-stream-functional-2.7
         - zuul-stream-functional-2.8

releasenotes/notes/ansible-2.5-1e4397795cc5b5ba.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Zuul no longer supports Ansible 2.5 for running jobs.

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

@@ -36,14 +36,6 @@
       test_ansible_version_major: 2
       test_ansible_version_minor: 6
 
-- job:
-    name: ansible-25
-    parent: ansible-version
-    ansible-version: 2.5
-    vars:
-      test_ansible_version_major: 2
-      test_ansible_version_minor: 5
-
 - job:
     name: ansible-26
     parent: ansible-version
@@ -82,7 +74,6 @@
     check:
       jobs:
         - ansible-default
-        - ansible-25
         - ansible-26
         - ansible-27
         - ansible-28
@@ -93,7 +84,6 @@
     check:
       jobs:
         - ansible-default-zuul-conf
-        - ansible-25
         - ansible-26
         - ansible-27
         - ansible-28

tests/remote/test_remote_action_modules.py

@@ -23,9 +23,9 @@ ERROR_SYNC_FROM_OUTSIDE = "Syncing files from outside the working dir"
 ERROR_SYNC_RSH = "Using custom synchronize rsh is prohibited"
 
 
-class TestActionModules25(AnsibleZuulTestCase):
+class TestActionModules26(AnsibleZuulTestCase):
     tenant_config_file = 'config/remote-action-modules/main.yaml'
-    ansible_version = '2.5'
+    ansible_version = '2.6'
 
     def setUp(self):
         super().setUp()
@@ -218,15 +218,11 @@ class TestActionModules25(AnsibleZuulTestCase):
         self._run_job('known-hosts-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE)
 
 
-class TestActionModules26(TestActionModules25):
+class TestActionModules27(TestActionModules26):
-    ansible_version = '2.6'
-
-
-class TestActionModules27(TestActionModules25):
     ansible_version = '2.7'
 
 
-class TestActionModules28(TestActionModules25):
+class TestActionModules28(TestActionModules27):
     ansible_version = '2.8'
 
 

tests/remote/test_remote_zuul_json.py

@@ -20,9 +20,9 @@ import textwrap
 from tests.base import AnsibleZuulTestCase
 
 
-class TestZuulJSON25(AnsibleZuulTestCase):
+class TestZuulJSON26(AnsibleZuulTestCase):
     tenant_config_file = 'config/remote-zuul-json/main.yaml'
-    ansible_version = '2.5'
+    ansible_version = '2.6'
 
     def setUp(self):
         super().setUp()
@@ -144,15 +144,11 @@ class TestZuulJSON25(AnsibleZuulTestCase):
             dateutil.parser.parse(play_end_time)
 
 
-class TestZuulJSON26(TestZuulJSON25):
+class TestZuulJSON27(TestZuulJSON26):
-    ansible_version = '2.6'
-
-
-class TestZuulJSON27(TestZuulJSON25):
     ansible_version = '2.7'
 
 
-class TestZuulJSON28(TestZuulJSON25):
+class TestZuulJSON28(TestZuulJSON27):
     ansible_version = '2.8'
 
     def test_json_task_action(self):

tests/remote/test_remote_zuul_stream.py

@@ -19,9 +19,9 @@ import textwrap
 from tests.base import AnsibleZuulTestCase
 
 
-class TestZuulStream25(AnsibleZuulTestCase):
+class TestZuulStream26(AnsibleZuulTestCase):
     tenant_config_file = 'config/remote-zuul-stream/main.yaml'
-    ansible_version = '2.5'
+    ansible_version = '2.6'
 
     def setUp(self):
         self.log_console_port = 19000 + int(self.ansible_version.split('.')[1])
@@ -192,15 +192,11 @@ class TestZuulStream25(AnsibleZuulTestCase):
             self.assertLogLine(regex, text)
 
 
-class TestZuulStream26(TestZuulStream25):
+class TestZuulStream27(TestZuulStream26):
-    ansible_version = '2.6'
-
-
-class TestZuulStream27(TestZuulStream25):
     ansible_version = '2.7'
 
 
-class TestZuulStream28(TestZuulStream25):
+class TestZuulStream28(TestZuulStream27):
     ansible_version = '2.8'
 
     def test_command(self):

tests/unit/test_v3.py

@@ -2568,11 +2568,11 @@ class TestInRepoJoin(ZuulTestCase):
         self.assertHistory([])
 
 
-class TestAnsible25(AnsibleZuulTestCase):
+class TestAnsible26(AnsibleZuulTestCase):
     # A temporary class to hold new tests while others are disabled
 
     tenant_config_file = 'config/ansible/main.yaml'
-    ansible_version = '2.5'
+    ansible_version = '2.6'
 
     def test_playbook(self):
         # This test runs a bit long and needs extra time.
@@ -2764,15 +2764,11 @@ class TestAnsible25(AnsibleZuulTestCase):
         self._test_plugins(plugin_tests)
 
 
-class TestAnsible26(TestAnsible25):
+class TestAnsible27(TestAnsible26):
-    ansible_version = '2.6'
-
-
-class TestAnsible27(TestAnsible25):
     ansible_version = '2.7'
 
 
-class TestAnsible28(TestAnsible25):
+class TestAnsible28(TestAnsible27):
     ansible_version = '2.8'
 
 
@@ -6224,7 +6220,6 @@ 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'),
             dict(name='ansible-27', result='SUCCESS', changes='1,1'),
             dict(name='ansible-28', result='SUCCESS', changes='1,1'),
@@ -6247,7 +6242,6 @@ class TestDefaultAnsibleVersion(AnsibleZuulTestCase):
         self.assertHistory([
             dict(name='ansible-default-zuul-conf', result='SUCCESS',
                  changes='1,1'),
-            dict(name='ansible-25', result='SUCCESS', changes='1,1'),
             dict(name='ansible-26', result='SUCCESS', changes='1,1'),
             dict(name='ansible-27', result='SUCCESS', changes='1,1'),
             dict(name='ansible-28', result='SUCCESS', changes='1,1'),

zuul/ansible/2.5/action/__init__.py

@@ -1 +0,0 @@
-../../base/action/__init__.py

zuul/ansible/2.5/action/add_host.py

@@ -1 +0,0 @@
-../../base/action/add_host.py

zuul/ansible/2.5/action/add_host.pyi

@@ -1 +0,0 @@
-../../base/action/add_host.pyi

zuul/ansible/2.5/action/aireos.py

@@ -1 +0,0 @@
-../../base/action/aireos.py

zuul/ansible/2.5/action/aireos.pyi

@@ -1 +0,0 @@
-../../base/action/aireos.pyi

zuul/ansible/2.5/action/aireos_config.py

@@ -1 +0,0 @@
-../../base/action/aireos_config.py

zuul/ansible/2.5/action/aireos_config.pyi

@@ -1 +0,0 @@
-../../base/action/aireos_config.pyi

zuul/ansible/2.5/action/aruba.py

@@ -1 +0,0 @@
-../../base/action/aruba.py

zuul/ansible/2.5/action/aruba.pyi

@@ -1 +0,0 @@
-../../base/action/aruba.pyi

zuul/ansible/2.5/action/aruba_config.py

@@ -1 +0,0 @@
-../../base/action/aruba_config.py

zuul/ansible/2.5/action/aruba_config.pyi

@@ -1 +0,0 @@
-../../base/action/aruba_config.pyi

zuul/ansible/2.5/action/asa.py

@@ -1 +0,0 @@
-../../base/action/asa.py

zuul/ansible/2.5/action/asa.pyi

@@ -1 +0,0 @@
-../../base/action/asa.pyi

zuul/ansible/2.5/action/asa_config.py

@@ -1 +0,0 @@
-../../base/action/asa_config.py

zuul/ansible/2.5/action/asa_config.pyi

@@ -1 +0,0 @@
-../../base/action/asa_config.pyi

zuul/ansible/2.5/action/asa_template.py

@@ -1 +0,0 @@
-../../base/action/asa_template.py

zuul/ansible/2.5/action/asa_template.pyi

@@ -1 +0,0 @@
-../../base/action/asa_template.pyi

zuul/ansible/2.5/action/assemble.py

@@ -1 +0,0 @@
-../../base/action/assemble.py

zuul/ansible/2.5/action/assemble.pyi

@@ -1 +0,0 @@
-../../base/action/assemble.pyi

zuul/ansible/2.5/action/ce.py

@@ -1 +0,0 @@
-../../base/action/ce.py

zuul/ansible/2.5/action/ce.pyi

@@ -1 +0,0 @@
-../../base/action/ce.pyi

zuul/ansible/2.5/action/ce_config.py

@@ -1 +0,0 @@
-../../base/action/ce_config.py

zuul/ansible/2.5/action/ce_config.pyi

@@ -1 +0,0 @@
-../../base/action/ce_config.pyi

zuul/ansible/2.5/action/ce_template.py

@@ -1 +0,0 @@
-../../base/action/ce_template.py

zuul/ansible/2.5/action/ce_template.pyi

@@ -1 +0,0 @@
-../../base/action/ce_template.pyi

zuul/ansible/2.5/action/copy.py

@@ -1 +0,0 @@
-../../base/action/copy.py

zuul/ansible/2.5/action/copy.pyi

@@ -1 +0,0 @@
-../../base/action/copy.pyi

zuul/ansible/2.5/action/dellos10_config.py

@@ -1 +0,0 @@
-../../base/action/dellos10_config.py

zuul/ansible/2.5/action/dellos10_config.pyi

@@ -1 +0,0 @@
-../../base/action/dellos10_config.pyi

zuul/ansible/2.5/action/dellos6_config.py

@@ -1 +0,0 @@
-../../base/action/dellos6_config.py

zuul/ansible/2.5/action/dellos6_config.pyi

@@ -1 +0,0 @@
-../../base/action/dellos6_config.pyi

zuul/ansible/2.5/action/dellos9_config.py

@@ -1 +0,0 @@
-../../base/action/dellos9_config.py

zuul/ansible/2.5/action/dellos9_config.pyi

@@ -1 +0,0 @@
-../../base/action/dellos9_config.pyi

zuul/ansible/2.5/action/eos_config.py

@@ -1 +0,0 @@
-../../base/action/eos_config.py

zuul/ansible/2.5/action/eos_config.pyi

@@ -1 +0,0 @@
-../../base/action/eos_config.pyi

zuul/ansible/2.5/action/eos_template.py

@@ -1 +0,0 @@
-../../base/action/eos_template.py

zuul/ansible/2.5/action/eos_template.pyi

@@ -1 +0,0 @@
-../../base/action/eos_template.pyi

zuul/ansible/2.5/action/fetch.py

@@ -1 +0,0 @@
-../../base/action/fetch.py

zuul/ansible/2.5/action/fetch.pyi

@@ -1 +0,0 @@
-../../base/action/fetch.pyi

zuul/ansible/2.5/action/fortios_config.py

@@ -1 +0,0 @@
-../../base/action/fortios_config.py

zuul/ansible/2.5/action/fortios_config.pyi

@@ -1 +0,0 @@
-../../base/action/fortios_config.pyi

zuul/ansible/2.5/action/include_vars.py

@@ -1 +0,0 @@
-../../base/action/include_vars.py

zuul/ansible/2.5/action/include_vars.pyi

@@ -1 +0,0 @@
-../../base/action/include_vars.pyi

zuul/ansible/2.5/action/ios_config.py

@@ -1 +0,0 @@
-../../base/action/ios_config.py

zuul/ansible/2.5/action/ios_config.pyi

@@ -1 +0,0 @@
-../../base/action/ios_config.pyi

zuul/ansible/2.5/action/ios_template.py

@@ -1 +0,0 @@
-../../base/action/ios_template.py

zuul/ansible/2.5/action/ios_template.pyi

@@ -1 +0,0 @@
-../../base/action/ios_template.pyi

zuul/ansible/2.5/action/iosxr_config.py

@@ -1 +0,0 @@
-../../base/action/iosxr_config.py

zuul/ansible/2.5/action/iosxr_config.pyi

@@ -1 +0,0 @@
-../../base/action/iosxr_config.pyi

zuul/ansible/2.5/action/iosxr_template.py

@@ -1 +0,0 @@
-../../base/action/iosxr_template.py

zuul/ansible/2.5/action/iosxr_template.pyi

@@ -1 +0,0 @@
-../../base/action/iosxr_template.pyi

zuul/ansible/2.5/action/junos_config.py

@@ -1 +0,0 @@
-../../base/action/junos_config.py

zuul/ansible/2.5/action/junos_config.pyi

@@ -1 +0,0 @@
-../../base/action/junos_config.pyi

zuul/ansible/2.5/action/junos_template.py

@@ -1 +0,0 @@
-../../base/action/junos_template.py

zuul/ansible/2.5/action/junos_template.pyi

@@ -1 +0,0 @@
-../../base/action/junos_template.pyi

zuul/ansible/2.5/action/net_banner.py

@@ -1 +0,0 @@
-../../base/action/net_banner.py

zuul/ansible/2.5/action/net_banner.pyi

@@ -1 +0,0 @@
-../../base/action/net_banner.pyi

zuul/ansible/2.5/action/net_base.py

@@ -1 +0,0 @@
-../../base/action/net_base.py

zuul/ansible/2.5/action/net_base.pyi

@@ -1 +0,0 @@
-../../base/action/net_base.pyi

zuul/ansible/2.5/action/net_config.py

@@ -1 +0,0 @@
-../../base/action/net_config.py

zuul/ansible/2.5/action/net_config.pyi

@@ -1 +0,0 @@
-../../base/action/net_config.pyi

zuul/ansible/2.5/action/net_interface.py

@@ -1 +0,0 @@
-../../base/action/net_interface.py

zuul/ansible/2.5/action/net_interface.pyi

@@ -1 +0,0 @@
-../../base/action/net_interface.pyi

zuul/ansible/2.5/action/net_l2_interface.py

@@ -1 +0,0 @@
-../../base/action/net_l2_interface.py

zuul/ansible/2.5/action/net_l2_interface.pyi

@@ -1 +0,0 @@
-../../base/action/net_l2_interface.pyi

zuul/ansible/2.5/action/net_l3_interface.py

@@ -1 +0,0 @@
-../../base/action/net_l3_interface.py

zuul/ansible/2.5/action/net_l3_interface.pyi

@@ -1 +0,0 @@
-../../base/action/net_l3_interface.pyi

zuul/ansible/2.5/action/net_linkagg.py

@@ -1 +0,0 @@
-../../base/action/net_linkagg.py

zuul/ansible/2.5/action/net_linkagg.pyi

@@ -1 +0,0 @@
-../../base/action/net_linkagg.pyi

zuul/ansible/2.5/action/net_lldp.py

@@ -1 +0,0 @@
-../../base/action/net_lldp.py

zuul/ansible/2.5/action/net_lldp.pyi

@@ -1 +0,0 @@
-../../base/action/net_lldp.pyi

zuul/ansible/2.5/action/net_lldp_interface.py

@@ -1 +0,0 @@
-../../base/action/net_lldp_interface.py

zuul/ansible/2.5/action/net_lldp_interface.pyi

@@ -1 +0,0 @@
-../../base/action/net_lldp_interface.pyi

zuul/ansible/2.5/action/net_logging.py

@@ -1 +0,0 @@
-../../base/action/net_logging.py

zuul/ansible/2.5/action/net_logging.pyi

@@ -1 +0,0 @@
-../../base/action/net_logging.pyi

zuul/ansible/2.5/action/net_ping.py

@@ -1 +0,0 @@
-../../base/action/net_ping.py

zuul/ansible/2.5/action/net_ping.pyi

@@ -1 +0,0 @@
-../../base/action/net_ping.pyi

zuul/ansible/2.5/action/net_static_route.py

@@ -1 +0,0 @@
-../../base/action/net_static_route.py

zuul/ansible/2.5/action/net_static_route.pyi

@@ -1 +0,0 @@
-../../base/action/net_static_route.pyi

zuul/ansible/2.5/action/net_system.py

@@ -1 +0,0 @@
-../../base/action/net_system.py

zuul/ansible/2.5/action/net_system.pyi

@@ -1 +0,0 @@
-../../base/action/net_system.pyi

zuul/ansible/2.5/action/net_template.py

@@ -1 +0,0 @@
-../../base/action/net_template.py

zuul/ansible/2.5/action/net_template.pyi

@@ -1 +0,0 @@
-../../base/action/net_template.pyi

zuul/ansible/2.5/action/net_user.py

@@ -1 +0,0 @@
-../../base/action/net_user.py

zuul/ansible/2.5/action/net_user.pyi

@@ -1 +0,0 @@
-../../base/action/net_user.pyi

zuul/ansible/2.5/action/net_vlan.py

@@ -1 +0,0 @@
-../../base/action/net_vlan.py

zuul/ansible/2.5/action/net_vlan.pyi

@@ -1 +0,0 @@
-../../base/action/net_vlan.pyi

zuul/ansible/2.5/action/net_vrf.py

@@ -1 +0,0 @@
-../../base/action/net_vrf.py

zuul/ansible/2.5/action/net_vrf.pyi

@@ -1 +0,0 @@
-../../base/action/net_vrf.pyi

zuul/ansible/2.5/action/netconf_config.py

@@ -1 +0,0 @@
-../../base/action/netconf_config.py

zuul/ansible/2.5/action/netconf_config.pyi

@@ -1 +0,0 @@
-../../base/action/netconf_config.pyi

zuul/ansible/2.5/action/network.py

@@ -1 +0,0 @@
-../../base/action/network.py

zuul/ansible/2.5/action/network.pyi

@@ -1 +0,0 @@
-../../base/action/network.pyi