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>

200 files changed, 20 insertions, 251 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 1fe343c15..e7379f63d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,15 +28,6 @@
       - 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
     # Force executor to use same Ansible version as "controller" node so
@@ -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
diff --git a/releasenotes/notes/ansible-2.5-1e4397795cc5b5ba.yaml b/releasenotes/notes/ansible-2.5-1e4397795cc5b5ba.yaml
new file mode 100644
index 000000000..28a12ef28
--- /dev/null
+++ b/releasenotes/notes/ansible-2.5-1e4397795cc5b5ba.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Zuul no longer supports Ansible 2.5 for running jobs.
diff --git a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml
index b787b5f38..a9ff58932 100644
--- a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml
@@ -37,14 +37,6 @@
       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
     ansible-version: 2.6
@@ -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
diff --git a/tests/remote/test_remote_action_modules.py b/tests/remote/test_remote_action_modules.py
index 8d1d5d36f..744b7659f 100644
--- a/tests/remote/test_remote_action_modules.py
+++ b/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):
-    ansible_version = '2.6'
-
-
-class TestActionModules27(TestActionModules25):
+class TestActionModules27(TestActionModules26):
     ansible_version = '2.7'
 
 
-class TestActionModules28(TestActionModules25):
+class TestActionModules28(TestActionModules27):
     ansible_version = '2.8'
 
 
diff --git a/tests/remote/test_remote_zuul_json.py b/tests/remote/test_remote_zuul_json.py
index c67d68ab5..744b2bbf3 100644
--- a/tests/remote/test_remote_zuul_json.py
+++ b/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):
-    ansible_version = '2.6'
-
-
-class TestZuulJSON27(TestZuulJSON25):
+class TestZuulJSON27(TestZuulJSON26):
     ansible_version = '2.7'
 
 
-class TestZuulJSON28(TestZuulJSON25):
+class TestZuulJSON28(TestZuulJSON27):
     ansible_version = '2.8'
 
     def test_json_task_action(self):
diff --git a/tests/remote/test_remote_zuul_stream.py b/tests/remote/test_remote_zuul_stream.py
index ffe33ad5e..76392c73f 100644
--- a/tests/remote/test_remote_zuul_stream.py
+++ b/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):
-    ansible_version = '2.6'
-
-
-class TestZuulStream27(TestZuulStream25):
+class TestZuulStream27(TestZuulStream26):
     ansible_version = '2.7'
 
 
-class TestZuulStream28(TestZuulStream25):
+class TestZuulStream28(TestZuulStream27):
     ansible_version = '2.8'
 
     def test_command(self):
diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py
index fffcd1753..4ebb1a11c 100644
--- a/tests/unit/test_v3.py
+++ b/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):
-    ansible_version = '2.6'
-
-
-class TestAnsible27(TestAnsible25):
+class TestAnsible27(TestAnsible26):
     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'),
diff --git a/zuul/ansible/2.5/action/__init__.py b/zuul/ansible/2.5/action/__init__.py
deleted file mode 120000
index 4048e7ac1..000000000
--- a/zuul/ansible/2.5/action/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/add_host.py b/zuul/ansible/2.5/action/add_host.py
deleted file mode 120000
index fdb7f466b..000000000
--- a/zuul/ansible/2.5/action/add_host.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/add_host.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/add_host.pyi b/zuul/ansible/2.5/action/add_host.pyi
deleted file mode 120000
index 9257939ce..000000000
--- a/zuul/ansible/2.5/action/add_host.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/add_host.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aireos.py b/zuul/ansible/2.5/action/aireos.py
deleted file mode 120000
index f2459ab86..000000000
--- a/zuul/ansible/2.5/action/aireos.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aireos.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aireos.pyi b/zuul/ansible/2.5/action/aireos.pyi
deleted file mode 120000
index f58722a86..000000000
--- a/zuul/ansible/2.5/action/aireos.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aireos.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aireos_config.py b/zuul/ansible/2.5/action/aireos_config.py
deleted file mode 120000
index acc0dd85e..000000000
--- a/zuul/ansible/2.5/action/aireos_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aireos_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aireos_config.pyi b/zuul/ansible/2.5/action/aireos_config.pyi
deleted file mode 120000
index fc7b16cf6..000000000
--- a/zuul/ansible/2.5/action/aireos_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aireos_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aruba.py b/zuul/ansible/2.5/action/aruba.py
deleted file mode 120000
index 8784b92ed..000000000
--- a/zuul/ansible/2.5/action/aruba.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aruba.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aruba.pyi b/zuul/ansible/2.5/action/aruba.pyi
deleted file mode 120000
index 228b3ecfe..000000000
--- a/zuul/ansible/2.5/action/aruba.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aruba.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aruba_config.py b/zuul/ansible/2.5/action/aruba_config.py
deleted file mode 120000
index f50d9082b..000000000
--- a/zuul/ansible/2.5/action/aruba_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aruba_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/aruba_config.pyi b/zuul/ansible/2.5/action/aruba_config.pyi
deleted file mode 120000
index bab9d28fd..000000000
--- a/zuul/ansible/2.5/action/aruba_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/aruba_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa.py b/zuul/ansible/2.5/action/asa.py
deleted file mode 120000
index 3e7e93dc0..000000000
--- a/zuul/ansible/2.5/action/asa.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa.pyi b/zuul/ansible/2.5/action/asa.pyi
deleted file mode 120000
index e0cdc24b5..000000000
--- a/zuul/ansible/2.5/action/asa.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa_config.py b/zuul/ansible/2.5/action/asa_config.py
deleted file mode 120000
index 598f400d5..000000000
--- a/zuul/ansible/2.5/action/asa_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa_config.pyi b/zuul/ansible/2.5/action/asa_config.pyi
deleted file mode 120000
index 86fe03484..000000000
--- a/zuul/ansible/2.5/action/asa_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa_template.py b/zuul/ansible/2.5/action/asa_template.py
deleted file mode 120000
index e1e8eecbe..000000000
--- a/zuul/ansible/2.5/action/asa_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/asa_template.pyi b/zuul/ansible/2.5/action/asa_template.pyi
deleted file mode 120000
index 0753101f1..000000000
--- a/zuul/ansible/2.5/action/asa_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/asa_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/assemble.py b/zuul/ansible/2.5/action/assemble.py
deleted file mode 120000
index 22273b123..000000000
--- a/zuul/ansible/2.5/action/assemble.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/assemble.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/assemble.pyi b/zuul/ansible/2.5/action/assemble.pyi
deleted file mode 120000
index 3a7074ec7..000000000
--- a/zuul/ansible/2.5/action/assemble.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/assemble.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce.py b/zuul/ansible/2.5/action/ce.py
deleted file mode 120000
index db95d9121..000000000
--- a/zuul/ansible/2.5/action/ce.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce.pyi b/zuul/ansible/2.5/action/ce.pyi
deleted file mode 120000
index ba2365f2b..000000000
--- a/zuul/ansible/2.5/action/ce.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce_config.py b/zuul/ansible/2.5/action/ce_config.py
deleted file mode 120000
index ec0319843..000000000
--- a/zuul/ansible/2.5/action/ce_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce_config.pyi b/zuul/ansible/2.5/action/ce_config.pyi
deleted file mode 120000
index b762785d1..000000000
--- a/zuul/ansible/2.5/action/ce_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce_template.py b/zuul/ansible/2.5/action/ce_template.py
deleted file mode 120000
index aa59e80a0..000000000
--- a/zuul/ansible/2.5/action/ce_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ce_template.pyi b/zuul/ansible/2.5/action/ce_template.pyi
deleted file mode 120000
index 75ba2250c..000000000
--- a/zuul/ansible/2.5/action/ce_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ce_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/copy.py b/zuul/ansible/2.5/action/copy.py
deleted file mode 120000
index 1c0c2291f..000000000
--- a/zuul/ansible/2.5/action/copy.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/copy.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/copy.pyi b/zuul/ansible/2.5/action/copy.pyi
deleted file mode 120000
index 189722f2a..000000000
--- a/zuul/ansible/2.5/action/copy.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/copy.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos10_config.py b/zuul/ansible/2.5/action/dellos10_config.py
deleted file mode 120000
index caf6ce6c3..000000000
--- a/zuul/ansible/2.5/action/dellos10_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos10_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos10_config.pyi b/zuul/ansible/2.5/action/dellos10_config.pyi
deleted file mode 120000
index ede9a927e..000000000
--- a/zuul/ansible/2.5/action/dellos10_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos10_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos6_config.py b/zuul/ansible/2.5/action/dellos6_config.py
deleted file mode 120000
index 080fcce4c..000000000
--- a/zuul/ansible/2.5/action/dellos6_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos6_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos6_config.pyi b/zuul/ansible/2.5/action/dellos6_config.pyi
deleted file mode 120000
index d5cf3ce15..000000000
--- a/zuul/ansible/2.5/action/dellos6_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos6_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos9_config.py b/zuul/ansible/2.5/action/dellos9_config.py
deleted file mode 120000
index c2e79870c..000000000
--- a/zuul/ansible/2.5/action/dellos9_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos9_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/dellos9_config.pyi b/zuul/ansible/2.5/action/dellos9_config.pyi
deleted file mode 120000
index b50389ab4..000000000
--- a/zuul/ansible/2.5/action/dellos9_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/dellos9_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/eos_config.py b/zuul/ansible/2.5/action/eos_config.py
deleted file mode 120000
index 4d1ab53bb..000000000
--- a/zuul/ansible/2.5/action/eos_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/eos_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/eos_config.pyi b/zuul/ansible/2.5/action/eos_config.pyi
deleted file mode 120000
index f6d058ba1..000000000
--- a/zuul/ansible/2.5/action/eos_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/eos_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/eos_template.py b/zuul/ansible/2.5/action/eos_template.py
deleted file mode 120000
index a108bf66f..000000000
--- a/zuul/ansible/2.5/action/eos_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/eos_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/eos_template.pyi b/zuul/ansible/2.5/action/eos_template.pyi
deleted file mode 120000
index b9cac42e8..000000000
--- a/zuul/ansible/2.5/action/eos_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/eos_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/fetch.py b/zuul/ansible/2.5/action/fetch.py
deleted file mode 120000
index d53e02548..000000000
--- a/zuul/ansible/2.5/action/fetch.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/fetch.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/fetch.pyi b/zuul/ansible/2.5/action/fetch.pyi
deleted file mode 120000
index b3ae31523..000000000
--- a/zuul/ansible/2.5/action/fetch.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/fetch.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/fortios_config.py b/zuul/ansible/2.5/action/fortios_config.py
deleted file mode 120000
index ef38743bc..000000000
--- a/zuul/ansible/2.5/action/fortios_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/fortios_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/fortios_config.pyi b/zuul/ansible/2.5/action/fortios_config.pyi
deleted file mode 120000
index fa334a059..000000000
--- a/zuul/ansible/2.5/action/fortios_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/fortios_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/include_vars.py b/zuul/ansible/2.5/action/include_vars.py
deleted file mode 120000
index 832d5a27a..000000000
--- a/zuul/ansible/2.5/action/include_vars.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/include_vars.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/include_vars.pyi b/zuul/ansible/2.5/action/include_vars.pyi
deleted file mode 120000
index 4099c1ae6..000000000
--- a/zuul/ansible/2.5/action/include_vars.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/include_vars.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ios_config.py b/zuul/ansible/2.5/action/ios_config.py
deleted file mode 120000
index f1495d47e..000000000
--- a/zuul/ansible/2.5/action/ios_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ios_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ios_config.pyi b/zuul/ansible/2.5/action/ios_config.pyi
deleted file mode 120000
index e6af5e34c..000000000
--- a/zuul/ansible/2.5/action/ios_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ios_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ios_template.py b/zuul/ansible/2.5/action/ios_template.py
deleted file mode 120000
index ef863cedf..000000000
--- a/zuul/ansible/2.5/action/ios_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ios_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ios_template.pyi b/zuul/ansible/2.5/action/ios_template.pyi
deleted file mode 120000
index c37247812..000000000
--- a/zuul/ansible/2.5/action/ios_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ios_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/iosxr_config.py b/zuul/ansible/2.5/action/iosxr_config.py
deleted file mode 120000
index 4eb293626..000000000
--- a/zuul/ansible/2.5/action/iosxr_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/iosxr_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/iosxr_config.pyi b/zuul/ansible/2.5/action/iosxr_config.pyi
deleted file mode 120000
index 70a2d67a3..000000000
--- a/zuul/ansible/2.5/action/iosxr_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/iosxr_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/iosxr_template.py b/zuul/ansible/2.5/action/iosxr_template.py
deleted file mode 120000
index 6a60fa49e..000000000
--- a/zuul/ansible/2.5/action/iosxr_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/iosxr_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/iosxr_template.pyi b/zuul/ansible/2.5/action/iosxr_template.pyi
deleted file mode 120000
index 918f5a113..000000000
--- a/zuul/ansible/2.5/action/iosxr_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/iosxr_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/junos_config.py b/zuul/ansible/2.5/action/junos_config.py
deleted file mode 120000
index c50f3bc67..000000000
--- a/zuul/ansible/2.5/action/junos_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/junos_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/junos_config.pyi b/zuul/ansible/2.5/action/junos_config.pyi
deleted file mode 120000
index 31cbba451..000000000
--- a/zuul/ansible/2.5/action/junos_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/junos_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/junos_template.py b/zuul/ansible/2.5/action/junos_template.py
deleted file mode 120000
index a2119b7cd..000000000
--- a/zuul/ansible/2.5/action/junos_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/junos_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/junos_template.pyi b/zuul/ansible/2.5/action/junos_template.pyi
deleted file mode 120000
index e6ef22ba9..000000000
--- a/zuul/ansible/2.5/action/junos_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/junos_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_banner.py b/zuul/ansible/2.5/action/net_banner.py
deleted file mode 120000
index 69cc6d5a4..000000000
--- a/zuul/ansible/2.5/action/net_banner.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_banner.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_banner.pyi b/zuul/ansible/2.5/action/net_banner.pyi
deleted file mode 120000
index f926dbf70..000000000
--- a/zuul/ansible/2.5/action/net_banner.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_banner.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_base.py b/zuul/ansible/2.5/action/net_base.py
deleted file mode 120000
index f36b6ecc7..000000000
--- a/zuul/ansible/2.5/action/net_base.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_base.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_base.pyi b/zuul/ansible/2.5/action/net_base.pyi
deleted file mode 120000
index 9f6ce1b7d..000000000
--- a/zuul/ansible/2.5/action/net_base.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_base.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_config.py b/zuul/ansible/2.5/action/net_config.py
deleted file mode 120000
index a817ca518..000000000
--- a/zuul/ansible/2.5/action/net_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_config.pyi b/zuul/ansible/2.5/action/net_config.pyi
deleted file mode 120000
index 412b8110e..000000000
--- a/zuul/ansible/2.5/action/net_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_interface.py b/zuul/ansible/2.5/action/net_interface.py
deleted file mode 120000
index 1d24f7821..000000000
--- a/zuul/ansible/2.5/action/net_interface.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_interface.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_interface.pyi b/zuul/ansible/2.5/action/net_interface.pyi
deleted file mode 120000
index 57bb45316..000000000
--- a/zuul/ansible/2.5/action/net_interface.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_interface.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_l2_interface.py b/zuul/ansible/2.5/action/net_l2_interface.py
deleted file mode 120000
index 1f44192c8..000000000
--- a/zuul/ansible/2.5/action/net_l2_interface.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_l2_interface.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_l2_interface.pyi b/zuul/ansible/2.5/action/net_l2_interface.pyi
deleted file mode 120000
index 2b780821d..000000000
--- a/zuul/ansible/2.5/action/net_l2_interface.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_l2_interface.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_l3_interface.py b/zuul/ansible/2.5/action/net_l3_interface.py
deleted file mode 120000
index 97017f4e3..000000000
--- a/zuul/ansible/2.5/action/net_l3_interface.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_l3_interface.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_l3_interface.pyi b/zuul/ansible/2.5/action/net_l3_interface.pyi
deleted file mode 120000
index 9317599a2..000000000
--- a/zuul/ansible/2.5/action/net_l3_interface.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_l3_interface.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_linkagg.py b/zuul/ansible/2.5/action/net_linkagg.py
deleted file mode 120000
index d3fc53dd1..000000000
--- a/zuul/ansible/2.5/action/net_linkagg.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_linkagg.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_linkagg.pyi b/zuul/ansible/2.5/action/net_linkagg.pyi
deleted file mode 120000
index b5fac56b6..000000000
--- a/zuul/ansible/2.5/action/net_linkagg.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_linkagg.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_lldp.py b/zuul/ansible/2.5/action/net_lldp.py
deleted file mode 120000
index 15fc3a859..000000000
--- a/zuul/ansible/2.5/action/net_lldp.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_lldp.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_lldp.pyi b/zuul/ansible/2.5/action/net_lldp.pyi
deleted file mode 120000
index a627fdec7..000000000
--- a/zuul/ansible/2.5/action/net_lldp.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_lldp.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_lldp_interface.py b/zuul/ansible/2.5/action/net_lldp_interface.py
deleted file mode 120000
index f57ec137f..000000000
--- a/zuul/ansible/2.5/action/net_lldp_interface.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_lldp_interface.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_lldp_interface.pyi b/zuul/ansible/2.5/action/net_lldp_interface.pyi
deleted file mode 120000
index fdd97b078..000000000
--- a/zuul/ansible/2.5/action/net_lldp_interface.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_lldp_interface.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_logging.py b/zuul/ansible/2.5/action/net_logging.py
deleted file mode 120000
index 57d9766aa..000000000
--- a/zuul/ansible/2.5/action/net_logging.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_logging.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_logging.pyi b/zuul/ansible/2.5/action/net_logging.pyi
deleted file mode 120000
index 1d6f1b029..000000000
--- a/zuul/ansible/2.5/action/net_logging.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_logging.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_ping.py b/zuul/ansible/2.5/action/net_ping.py
deleted file mode 120000
index 696d9f526..000000000
--- a/zuul/ansible/2.5/action/net_ping.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_ping.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_ping.pyi b/zuul/ansible/2.5/action/net_ping.pyi
deleted file mode 120000
index 03f84e975..000000000
--- a/zuul/ansible/2.5/action/net_ping.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_ping.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_static_route.py b/zuul/ansible/2.5/action/net_static_route.py
deleted file mode 120000
index c22b7f0e0..000000000
--- a/zuul/ansible/2.5/action/net_static_route.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_static_route.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_static_route.pyi b/zuul/ansible/2.5/action/net_static_route.pyi
deleted file mode 120000
index 859c20fec..000000000
--- a/zuul/ansible/2.5/action/net_static_route.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_static_route.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_system.py b/zuul/ansible/2.5/action/net_system.py
deleted file mode 120000
index a03dd93c9..000000000
--- a/zuul/ansible/2.5/action/net_system.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_system.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_system.pyi b/zuul/ansible/2.5/action/net_system.pyi
deleted file mode 120000
index cc159053b..000000000
--- a/zuul/ansible/2.5/action/net_system.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_system.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_template.py b/zuul/ansible/2.5/action/net_template.py
deleted file mode 120000
index 18ba965e4..000000000
--- a/zuul/ansible/2.5/action/net_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_template.pyi b/zuul/ansible/2.5/action/net_template.pyi
deleted file mode 120000
index 3bfbb6f0f..000000000
--- a/zuul/ansible/2.5/action/net_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_user.py b/zuul/ansible/2.5/action/net_user.py
deleted file mode 120000
index fcfb3f55a..000000000
--- a/zuul/ansible/2.5/action/net_user.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_user.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_user.pyi b/zuul/ansible/2.5/action/net_user.pyi
deleted file mode 120000
index 267f5da34..000000000
--- a/zuul/ansible/2.5/action/net_user.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_user.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_vlan.py b/zuul/ansible/2.5/action/net_vlan.py
deleted file mode 120000
index df275656f..000000000
--- a/zuul/ansible/2.5/action/net_vlan.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_vlan.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_vlan.pyi b/zuul/ansible/2.5/action/net_vlan.pyi
deleted file mode 120000
index 718074899..000000000
--- a/zuul/ansible/2.5/action/net_vlan.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_vlan.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_vrf.py b/zuul/ansible/2.5/action/net_vrf.py
deleted file mode 120000
index c757d2100..000000000
--- a/zuul/ansible/2.5/action/net_vrf.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_vrf.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/net_vrf.pyi b/zuul/ansible/2.5/action/net_vrf.pyi
deleted file mode 120000
index df043a0cd..000000000
--- a/zuul/ansible/2.5/action/net_vrf.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/net_vrf.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/netconf_config.py b/zuul/ansible/2.5/action/netconf_config.py
deleted file mode 120000
index 4d13bb82c..000000000
--- a/zuul/ansible/2.5/action/netconf_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/netconf_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/netconf_config.pyi b/zuul/ansible/2.5/action/netconf_config.pyi
deleted file mode 120000
index c75a746b4..000000000
--- a/zuul/ansible/2.5/action/netconf_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/netconf_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/network.py b/zuul/ansible/2.5/action/network.py
deleted file mode 120000
index 9e2d1baa4..000000000
--- a/zuul/ansible/2.5/action/network.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/network.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/network.pyi b/zuul/ansible/2.5/action/network.pyi
deleted file mode 120000
index e1842d197..000000000
--- a/zuul/ansible/2.5/action/network.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/network.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/normal.py b/zuul/ansible/2.5/action/normal.py
deleted file mode 120000
index 4e131d98d..000000000
--- a/zuul/ansible/2.5/action/normal.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/normal.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/normal.pyi b/zuul/ansible/2.5/action/normal.pyi
deleted file mode 120000
index bbbe0704c..000000000
--- a/zuul/ansible/2.5/action/normal.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/normal.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/nxos_config.py b/zuul/ansible/2.5/action/nxos_config.py
deleted file mode 120000
index 0cc233c34..000000000
--- a/zuul/ansible/2.5/action/nxos_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/nxos_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/nxos_config.pyi b/zuul/ansible/2.5/action/nxos_config.pyi
deleted file mode 120000
index b2e63b6e3..000000000
--- a/zuul/ansible/2.5/action/nxos_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/nxos_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/nxos_template.py b/zuul/ansible/2.5/action/nxos_template.py
deleted file mode 120000
index 3d599062a..000000000
--- a/zuul/ansible/2.5/action/nxos_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/nxos_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/nxos_template.pyi b/zuul/ansible/2.5/action/nxos_template.pyi
deleted file mode 120000
index e36fa4e90..000000000
--- a/zuul/ansible/2.5/action/nxos_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/nxos_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ops_config.py b/zuul/ansible/2.5/action/ops_config.py
deleted file mode 120000
index 2abe0669d..000000000
--- a/zuul/ansible/2.5/action/ops_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ops_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ops_config.pyi b/zuul/ansible/2.5/action/ops_config.pyi
deleted file mode 120000
index 7517f9c7b..000000000
--- a/zuul/ansible/2.5/action/ops_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ops_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ops_template.py b/zuul/ansible/2.5/action/ops_template.py
deleted file mode 120000
index 5c841ca57..000000000
--- a/zuul/ansible/2.5/action/ops_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ops_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/ops_template.pyi b/zuul/ansible/2.5/action/ops_template.pyi
deleted file mode 120000
index 4baa28a3f..000000000
--- a/zuul/ansible/2.5/action/ops_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/ops_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/patch.py b/zuul/ansible/2.5/action/patch.py
deleted file mode 120000
index 8996710ba..000000000
--- a/zuul/ansible/2.5/action/patch.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/patch.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/patch.pyi b/zuul/ansible/2.5/action/patch.pyi
deleted file mode 120000
index 577e43600..000000000
--- a/zuul/ansible/2.5/action/patch.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/patch.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/raw.py b/zuul/ansible/2.5/action/raw.py
deleted file mode 120000
index e4962dd8a..000000000
--- a/zuul/ansible/2.5/action/raw.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/raw.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/raw.pyi b/zuul/ansible/2.5/action/raw.pyi
deleted file mode 120000
index 741945ef2..000000000
--- a/zuul/ansible/2.5/action/raw.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/raw.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/script.py b/zuul/ansible/2.5/action/script.py
deleted file mode 120000
index 1cccf5805..000000000
--- a/zuul/ansible/2.5/action/script.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/script.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/script.pyi b/zuul/ansible/2.5/action/script.pyi
deleted file mode 120000
index aff69744b..000000000
--- a/zuul/ansible/2.5/action/script.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/script.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/sros_config.py b/zuul/ansible/2.5/action/sros_config.py
deleted file mode 120000
index 1762874e4..000000000
--- a/zuul/ansible/2.5/action/sros_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/sros_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/sros_config.pyi b/zuul/ansible/2.5/action/sros_config.pyi
deleted file mode 120000
index 453e4b8e1..000000000
--- a/zuul/ansible/2.5/action/sros_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/sros_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/synchronize.py b/zuul/ansible/2.5/action/synchronize.py
deleted file mode 120000
index f2126166c..000000000
--- a/zuul/ansible/2.5/action/synchronize.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/synchronize.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/synchronize.pyi b/zuul/ansible/2.5/action/synchronize.pyi
deleted file mode 120000
index 4ff1a2ee9..000000000
--- a/zuul/ansible/2.5/action/synchronize.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/synchronize.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/template.py b/zuul/ansible/2.5/action/template.py
deleted file mode 120000
index 720717d83..000000000
--- a/zuul/ansible/2.5/action/template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/template.pyi b/zuul/ansible/2.5/action/template.pyi
deleted file mode 120000
index aed7fb07a..000000000
--- a/zuul/ansible/2.5/action/template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/unarchive.py b/zuul/ansible/2.5/action/unarchive.py
deleted file mode 120000
index 2d7ce5aed..000000000
--- a/zuul/ansible/2.5/action/unarchive.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/unarchive.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/unarchive.pyi b/zuul/ansible/2.5/action/unarchive.pyi
deleted file mode 120000
index fead9ca55..000000000
--- a/zuul/ansible/2.5/action/unarchive.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/unarchive.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/vyos_config.py b/zuul/ansible/2.5/action/vyos_config.py
deleted file mode 120000
index 2732fd7a1..000000000
--- a/zuul/ansible/2.5/action/vyos_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/vyos_config.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/vyos_config.pyi b/zuul/ansible/2.5/action/vyos_config.pyi
deleted file mode 120000
index ac5d76632..000000000
--- a/zuul/ansible/2.5/action/vyos_config.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/vyos_config.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/win_copy.py b/zuul/ansible/2.5/action/win_copy.py
deleted file mode 120000
index 80c3f3846..000000000
--- a/zuul/ansible/2.5/action/win_copy.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/win_copy.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/win_copy.pyi b/zuul/ansible/2.5/action/win_copy.pyi
deleted file mode 120000
index 017c792ff..000000000
--- a/zuul/ansible/2.5/action/win_copy.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/win_copy.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/win_template.py b/zuul/ansible/2.5/action/win_template.py
deleted file mode 120000
index f2a8b2d63..000000000
--- a/zuul/ansible/2.5/action/win_template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/win_template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/action/win_template.pyi b/zuul/ansible/2.5/action/win_template.pyi
deleted file mode 120000
index 40825895b..000000000
--- a/zuul/ansible/2.5/action/win_template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/action/win_template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/actiongeneral/__init__.py b/zuul/ansible/2.5/actiongeneral/__init__.py
deleted file mode 120000
index 38d887448..000000000
--- a/zuul/ansible/2.5/actiongeneral/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/actiongeneral/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/actiongeneral/command.py b/zuul/ansible/2.5/actiongeneral/command.py
deleted file mode 120000
index f190db2cc..000000000
--- a/zuul/ansible/2.5/actiongeneral/command.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/actiongeneral/command.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/actiongeneral/command.pyi b/zuul/ansible/2.5/actiongeneral/command.pyi
deleted file mode 120000
index 81305dd03..000000000
--- a/zuul/ansible/2.5/actiongeneral/command.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/actiongeneral/command.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/actiongeneral/zuul_return.py b/zuul/ansible/2.5/actiongeneral/zuul_return.py
deleted file mode 120000
index 2f5b2559e..000000000
--- a/zuul/ansible/2.5/actiongeneral/zuul_return.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/actiongeneral/zuul_return.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/callback/__init__.py b/zuul/ansible/2.5/callback/__init__.py
deleted file mode 120000
index 00b974388..000000000
--- a/zuul/ansible/2.5/callback/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/callback/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/callback/zuul_json.py b/zuul/ansible/2.5/callback/zuul_json.py
deleted file mode 120000
index b0a07779b..000000000
--- a/zuul/ansible/2.5/callback/zuul_json.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/callback/zuul_json.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/callback/zuul_stream.py b/zuul/ansible/2.5/callback/zuul_stream.py
deleted file mode 120000
index f75561bf4..000000000
--- a/zuul/ansible/2.5/callback/zuul_stream.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/callback/zuul_stream.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/callback/zuul_unreachable.py b/zuul/ansible/2.5/callback/zuul_unreachable.py
deleted file mode 120000
index 205baca6f..000000000
--- a/zuul/ansible/2.5/callback/zuul_unreachable.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/callback/zuul_unreachable.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/filter/__init__.py b/zuul/ansible/2.5/filter/__init__.py
deleted file mode 120000
index f80a4da61..000000000
--- a/zuul/ansible/2.5/filter/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/filter/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/filter/zuul_filters.py b/zuul/ansible/2.5/filter/zuul_filters.py
deleted file mode 120000
index d406e5fe6..000000000
--- a/zuul/ansible/2.5/filter/zuul_filters.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/filter/zuul_filters.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/library/__init__.py b/zuul/ansible/2.5/library/__init__.py
deleted file mode 120000
index 0b68ce0f4..000000000
--- a/zuul/ansible/2.5/library/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/library/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/library/zuul_console.py b/zuul/ansible/2.5/library/zuul_console.py
deleted file mode 120000
index 7c905e0f9..000000000
--- a/zuul/ansible/2.5/library/zuul_console.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/library/zuul_console.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/logconfig.py b/zuul/ansible/2.5/logconfig.py
deleted file mode 120000
index 767cb2e81..000000000
--- a/zuul/ansible/2.5/logconfig.py
+++ /dev/null
@@ -1 +0,0 @@
-../logconfig.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/__init__.py b/zuul/ansible/2.5/lookup/__init__.py
deleted file mode 120000
index b008ecb3b..000000000
--- a/zuul/ansible/2.5/lookup/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/__init__.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/_banned.py b/zuul/ansible/2.5/lookup/_banned.py
deleted file mode 120000
index 2e127f4e7..000000000
--- a/zuul/ansible/2.5/lookup/_banned.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/_banned.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/_banned.pyi b/zuul/ansible/2.5/lookup/_banned.pyi
deleted file mode 120000
index d7909135d..000000000
--- a/zuul/ansible/2.5/lookup/_banned.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/_banned.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/chef_databag.py b/zuul/ansible/2.5/lookup/chef_databag.py
deleted file mode 120000
index d4efe7e85..000000000
--- a/zuul/ansible/2.5/lookup/chef_databag.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/chef_databag.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/chef_databag.pyi b/zuul/ansible/2.5/lookup/chef_databag.pyi
deleted file mode 120000
index c06fc3001..000000000
--- a/zuul/ansible/2.5/lookup/chef_databag.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/chef_databag.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/consul_kv.py b/zuul/ansible/2.5/lookup/consul_kv.py
deleted file mode 120000
index 66b6f7617..000000000
--- a/zuul/ansible/2.5/lookup/consul_kv.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/consul_kv.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/consul_kv.pyi b/zuul/ansible/2.5/lookup/consul_kv.pyi
deleted file mode 120000
index 33d848347..000000000
--- a/zuul/ansible/2.5/lookup/consul_kv.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/consul_kv.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/credstash.py b/zuul/ansible/2.5/lookup/credstash.py
deleted file mode 120000
index 2c343a27e..000000000
--- a/zuul/ansible/2.5/lookup/credstash.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/credstash.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/credstash.pyi b/zuul/ansible/2.5/lookup/credstash.pyi
deleted file mode 120000
index 071af9d1a..000000000
--- a/zuul/ansible/2.5/lookup/credstash.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/credstash.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/csvfile.py b/zuul/ansible/2.5/lookup/csvfile.py
deleted file mode 120000
index 981754791..000000000
--- a/zuul/ansible/2.5/lookup/csvfile.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/csvfile.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/csvfile.pyi b/zuul/ansible/2.5/lookup/csvfile.pyi
deleted file mode 120000
index 18ded3684..000000000
--- a/zuul/ansible/2.5/lookup/csvfile.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/csvfile.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/cyberarkpassword.py b/zuul/ansible/2.5/lookup/cyberarkpassword.py
deleted file mode 120000
index a573c0cf3..000000000
--- a/zuul/ansible/2.5/lookup/cyberarkpassword.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/cyberarkpassword.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/cyberarkpassword.pyi b/zuul/ansible/2.5/lookup/cyberarkpassword.pyi
deleted file mode 120000
index 01543847e..000000000
--- a/zuul/ansible/2.5/lookup/cyberarkpassword.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/cyberarkpassword.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/dig.py b/zuul/ansible/2.5/lookup/dig.py
deleted file mode 120000
index 92a628c4a..000000000
--- a/zuul/ansible/2.5/lookup/dig.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/dig.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/dig.pyi b/zuul/ansible/2.5/lookup/dig.pyi
deleted file mode 120000
index 7268b42c3..000000000
--- a/zuul/ansible/2.5/lookup/dig.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/dig.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/dnstxt.py b/zuul/ansible/2.5/lookup/dnstxt.py
deleted file mode 120000
index aa3e0f2d9..000000000
--- a/zuul/ansible/2.5/lookup/dnstxt.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/dnstxt.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/dnstxt.pyi b/zuul/ansible/2.5/lookup/dnstxt.pyi
deleted file mode 120000
index 1c221784c..000000000
--- a/zuul/ansible/2.5/lookup/dnstxt.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/dnstxt.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/env.py b/zuul/ansible/2.5/lookup/env.py
deleted file mode 120000
index 124393630..000000000
--- a/zuul/ansible/2.5/lookup/env.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/env.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/env.pyi b/zuul/ansible/2.5/lookup/env.pyi
deleted file mode 120000
index e0ecae07a..000000000
--- a/zuul/ansible/2.5/lookup/env.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/env.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/etcd.py b/zuul/ansible/2.5/lookup/etcd.py
deleted file mode 120000
index c42007aa6..000000000
--- a/zuul/ansible/2.5/lookup/etcd.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/etcd.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/etcd.pyi b/zuul/ansible/2.5/lookup/etcd.pyi
deleted file mode 120000
index a1d4e0458..000000000
--- a/zuul/ansible/2.5/lookup/etcd.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/etcd.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/file.py b/zuul/ansible/2.5/lookup/file.py
deleted file mode 120000
index d1c0692d7..000000000
--- a/zuul/ansible/2.5/lookup/file.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/file.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/file.pyi b/zuul/ansible/2.5/lookup/file.pyi
deleted file mode 120000
index 588dc50c6..000000000
--- a/zuul/ansible/2.5/lookup/file.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/file.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/fileglob.py b/zuul/ansible/2.5/lookup/fileglob.py
deleted file mode 120000
index 0249540ac..000000000
--- a/zuul/ansible/2.5/lookup/fileglob.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/fileglob.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/fileglob.pyi b/zuul/ansible/2.5/lookup/fileglob.pyi
deleted file mode 120000
index ffce6462b..000000000
--- a/zuul/ansible/2.5/lookup/fileglob.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/fileglob.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/filetree.py b/zuul/ansible/2.5/lookup/filetree.py
deleted file mode 120000
index 96cc789ac..000000000
--- a/zuul/ansible/2.5/lookup/filetree.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/filetree.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/filetree.pyi b/zuul/ansible/2.5/lookup/filetree.pyi
deleted file mode 120000
index ca38966f5..000000000
--- a/zuul/ansible/2.5/lookup/filetree.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/filetree.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/first_found.py b/zuul/ansible/2.5/lookup/first_found.py
deleted file mode 120000
index 0a01ced20..000000000
--- a/zuul/ansible/2.5/lookup/first_found.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/first_found.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/first_found.pyi b/zuul/ansible/2.5/lookup/first_found.pyi
deleted file mode 120000
index a3a92f250..000000000
--- a/zuul/ansible/2.5/lookup/first_found.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/first_found.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/hiera.py b/zuul/ansible/2.5/lookup/hiera.py
deleted file mode 120000
index 01e1883e3..000000000
--- a/zuul/ansible/2.5/lookup/hiera.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/hiera.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/hiera.pyi b/zuul/ansible/2.5/lookup/hiera.pyi
deleted file mode 120000
index b7756855a..000000000
--- a/zuul/ansible/2.5/lookup/hiera.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/hiera.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/ini.py b/zuul/ansible/2.5/lookup/ini.py
deleted file mode 120000
index 6453943b9..000000000
--- a/zuul/ansible/2.5/lookup/ini.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/ini.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/ini.pyi b/zuul/ansible/2.5/lookup/ini.pyi
deleted file mode 120000
index b66fe999a..000000000
--- a/zuul/ansible/2.5/lookup/ini.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/ini.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/keyring.py b/zuul/ansible/2.5/lookup/keyring.py
deleted file mode 120000
index 864d62d6f..000000000
--- a/zuul/ansible/2.5/lookup/keyring.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/keyring.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/keyring.pyi b/zuul/ansible/2.5/lookup/keyring.pyi
deleted file mode 120000
index 9a0c24b55..000000000
--- a/zuul/ansible/2.5/lookup/keyring.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/keyring.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/lastpass.py b/zuul/ansible/2.5/lookup/lastpass.py
deleted file mode 120000
index a28abff20..000000000
--- a/zuul/ansible/2.5/lookup/lastpass.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/lastpass.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/lastpass.pyi b/zuul/ansible/2.5/lookup/lastpass.pyi
deleted file mode 120000
index dfd6e6b31..000000000
--- a/zuul/ansible/2.5/lookup/lastpass.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/lastpass.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/lines.py b/zuul/ansible/2.5/lookup/lines.py
deleted file mode 120000
index c2cae632b..000000000
--- a/zuul/ansible/2.5/lookup/lines.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/lines.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/lines.pyi b/zuul/ansible/2.5/lookup/lines.pyi
deleted file mode 120000
index 3ddc687f9..000000000
--- a/zuul/ansible/2.5/lookup/lines.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/lines.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/mongodb.py b/zuul/ansible/2.5/lookup/mongodb.py
deleted file mode 120000
index 737037fa1..000000000
--- a/zuul/ansible/2.5/lookup/mongodb.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/mongodb.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/mongodb.pyi b/zuul/ansible/2.5/lookup/mongodb.pyi
deleted file mode 120000
index 4c8f754ef..000000000
--- a/zuul/ansible/2.5/lookup/mongodb.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/mongodb.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/password.py b/zuul/ansible/2.5/lookup/password.py
deleted file mode 120000
index 478e6bee6..000000000
--- a/zuul/ansible/2.5/lookup/password.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/password.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/password.pyi b/zuul/ansible/2.5/lookup/password.pyi
deleted file mode 120000
index 370986cbc..000000000
--- a/zuul/ansible/2.5/lookup/password.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/password.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/passwordstore.py b/zuul/ansible/2.5/lookup/passwordstore.py
deleted file mode 120000
index af4c4aa92..000000000
--- a/zuul/ansible/2.5/lookup/passwordstore.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/passwordstore.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/passwordstore.pyi b/zuul/ansible/2.5/lookup/passwordstore.pyi
deleted file mode 120000
index 9ba9b718a..000000000
--- a/zuul/ansible/2.5/lookup/passwordstore.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/passwordstore.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/pipe.py b/zuul/ansible/2.5/lookup/pipe.py
deleted file mode 120000
index ea688c3a3..000000000
--- a/zuul/ansible/2.5/lookup/pipe.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/pipe.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/pipe.pyi b/zuul/ansible/2.5/lookup/pipe.pyi
deleted file mode 120000
index 01d6b935d..000000000
--- a/zuul/ansible/2.5/lookup/pipe.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/pipe.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/redis_kv.py b/zuul/ansible/2.5/lookup/redis_kv.py
deleted file mode 120000
index a711e2651..000000000
--- a/zuul/ansible/2.5/lookup/redis_kv.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/redis_kv.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/redis_kv.pyi b/zuul/ansible/2.5/lookup/redis_kv.pyi
deleted file mode 120000
index da9acca45..000000000
--- a/zuul/ansible/2.5/lookup/redis_kv.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/redis_kv.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/shelvefile.py b/zuul/ansible/2.5/lookup/shelvefile.py
deleted file mode 120000
index 2c76ec937..000000000
--- a/zuul/ansible/2.5/lookup/shelvefile.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/shelvefile.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/shelvefile.pyi b/zuul/ansible/2.5/lookup/shelvefile.pyi
deleted file mode 120000
index 827f4b076..000000000
--- a/zuul/ansible/2.5/lookup/shelvefile.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/shelvefile.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/template.py b/zuul/ansible/2.5/lookup/template.py
deleted file mode 120000
index ef6565ceb..000000000
--- a/zuul/ansible/2.5/lookup/template.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/template.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/template.pyi b/zuul/ansible/2.5/lookup/template.pyi
deleted file mode 120000
index f03685d5c..000000000
--- a/zuul/ansible/2.5/lookup/template.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/template.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/url.py b/zuul/ansible/2.5/lookup/url.py
deleted file mode 120000
index f936b748e..000000000
--- a/zuul/ansible/2.5/lookup/url.py
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/url.py
\ No newline at end of file
diff --git a/zuul/ansible/2.5/lookup/url.pyi b/zuul/ansible/2.5/lookup/url.pyi
deleted file mode 120000
index fc13f47c5..000000000
--- a/zuul/ansible/2.5/lookup/url.pyi
+++ /dev/null
@@ -1 +0,0 @@
-../../base/lookup/url.pyi
\ No newline at end of file
diff --git a/zuul/ansible/2.5/paths.py b/zuul/ansible/2.5/paths.py
deleted file mode 120000
index dbdb1858e..000000000
--- a/zuul/ansible/2.5/paths.py
+++ /dev/null
@@ -1 +0,0 @@
-../paths.py
\ No newline at end of file
diff --git a/zuul/lib/ansible-config.conf b/zuul/lib/ansible-config.conf
index 6d190051d..c76c7a2f8 100644
--- a/zuul/lib/ansible-config.conf
+++ b/zuul/lib/ansible-config.conf
@@ -3,10 +3,6 @@
 default_version = 2.8
 requirements = ara>=0.16.5,<1.0.0 openstacksdk openshift jmespath
 
-[2.5]
-deprecated = true
-requirements = ansible>=2.5.1,<2.6
-
 [2.6]
 deprecated = true
 requirements = ansible>=2.6,<2.7