diff options
author | James E. Blair <jim@acmegating.com> | 2022-04-06 16:58:10 -0700 |
---|---|---|
committer | James E. Blair <jim@acmegating.com> | 2022-04-13 14:17:04 -0700 |
commit | aec4019ca7a7e1cdd732b366b0a431a873b36d5b (patch) | |
tree | ef8c4bf432b11f8e17586c0af54d379440713123 /tests | |
parent | 1040489cd3fe4ad7642c4d41210d24ff7f360244 (diff) | |
download | zuul-aec4019ca7a7e1cdd732b366b0a431a873b36d5b.tar.gz |
Remove ansible plugin tests
These tests verify the restricted ansible modules which we no longer
want to use. Remove the tests.
Change-Id: Ie42d2289551fb81d4b5a86718ec5c6d6de80b34f
Diffstat (limited to 'tests')
29 files changed, 0 insertions, 249 deletions
diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/.zuul.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/.zuul.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/.zuul.yaml +++ /dev/null diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/README b/tests/fixtures/config/ansible/git/org_plugin-project/README deleted file mode 100644 index 9daeafb98..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/README +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/block_local_override.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/block_local_override.yaml deleted file mode 100644 index 58613add0..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/block_local_override.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: localhost - roles: - - test-local-override diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/cartesian.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/cartesian.yaml deleted file mode 100644 index a2e92a281..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/cartesian.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('cartesian', [1, 2], [3, 4]) }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/collections_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/collections_bad.yaml deleted file mode 100644 index 9a981293b..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/collections_bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - tasks: - - ansible.builtin.command: - cmd: 'echo foobar' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/consul_kv.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/consul_kv.yaml deleted file mode 100644 index 8cfee2e00..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/consul_kv.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - tasks: - - debug: msg='key contains {{item}}' - with_consul_kv: - - 'key/to/retrieve' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/credstash.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/credstash.yaml deleted file mode 100644 index 1a592815a..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/credstash.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - tasks: - - debug: msg='key contains {{item}}' - with_credstash: - - 'key' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_bad.yaml deleted file mode 100644 index 66e1d84fd..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_bad.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('csvfile', 'a file=/etc/passwd') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_good.yaml deleted file mode 100644 index 74ef51ea6..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/csvfile_good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('csvfile', 'a file=test.csv delimiter=,') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_bad.yaml deleted file mode 100644 index b567dfe2f..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_bad.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - name: Try to verify a file in a bad location - file: - dest: /tmp/unreadable - state: absent diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_good.yaml deleted file mode 100644 index 29b543122..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/file_local_good.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - name: Try to verify a file in an ok location - file: - dest: non-existent - state: absent diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_bad.yaml deleted file mode 100644 index b938c60dc..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_bad.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - name: fileglob in a bad location - debug: - msg: '{{ lookup("fileglob", "/tmp/*") }}' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_good.yaml deleted file mode 100644 index 5fa9e304a..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/fileglob_local_good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - name: fileglob in a good location - debug: - msg: '{{ lookup("fileglob", zuul.executor.work_root + "/*") }}' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_bad.yaml deleted file mode 100644 index c6eb4d723..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_bad.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - name: Find in a bad location - find: - paths: '/tmp/' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_good.yaml deleted file mode 100644 index 2e9af5b90..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/find_local_good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - name: Find in a good location - find: - paths: '{{ zuul.executor.work_root }}' diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/passwd.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/passwd.yaml deleted file mode 100644 index cc7480221..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/passwd.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('file', '/etc/passwd') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_bad.yaml deleted file mode 100644 index a346fdae9..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_bad.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('password', '/etc/passwd') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_good.yaml deleted file mode 100644 index 5aa95d247..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_create_good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('password', '{{ zuul.executor.work_root }}/test.newpassword') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_null_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_null_good.yaml deleted file mode 100644 index 8f42c1cf7..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_null_good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('password', '/dev/null') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_bad.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_bad.yaml deleted file mode 100644 index a346fdae9..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_bad.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - vars: - value: "{{ lookup('password', '/etc/passwd') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_good.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_good.yaml deleted file mode 100644 index b40c46575..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/password_read_good.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: all - tasks: - - copy: - content: 'an_example_password' - dest: "{{zuul.executor.work_root}}/test.password" -- hosts: all - vars: - value: "{{ lookup('password', '{{zuul.executor.work_root}}/test.password') }}" - tasks: - - debug: msg="value is {{ value }}" diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/library/file.py b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/library/file.py deleted file mode 100644 index 63478f707..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/library/file.py +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2017 Red Hat -# -# This module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this software. If not, see <http://www.gnu.org/licenses/>. - -# This file, by existing, should be found instead of ansible's built in -# file module. - - -def main(): - module = AnsibleModule( - argument_spec=dict( - path=dict(required=False, type='str'), - state=dict(required=False, type='dict'), - ) - ) - - module.exit_json(changed=False) - -from ansible.module_utils.basic import * # noqa -from ansible.module_utils.basic import AnsibleModule diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/tasks/main.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/tasks/main.yaml deleted file mode 100644 index a06608b0e..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/roles/test-local-override/tasks/main.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Attempt to use local version of file.py - file: - path: some-file.out - state: touch diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/test.csv b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/test.csv deleted file mode 100644 index b2ffb0252..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/test.csv +++ /dev/null @@ -1 +0,0 @@ -a,b,c diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml deleted file mode 100644 index 7130704da..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - uri: - method: GET - url: https://example.com - dest: /tmp/example.out diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_scheme.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_scheme.yaml deleted file mode 100644 index 5d717936e..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_scheme.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - uri: - method: GET - url: file:///etc/passwd diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/zuul_return.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/zuul_return.yaml deleted file mode 100644 index 47645b722..000000000 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/zuul_return.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - name: Execute zuul_return - zuul_return: - data: - foo: bar diff --git a/tests/fixtures/config/ansible/main.yaml b/tests/fixtures/config/ansible/main.yaml index f7d459c85..94e7aa78c 100644 --- a/tests/fixtures/config/ansible/main.yaml +++ b/tests/fixtures/config/ansible/main.yaml @@ -6,6 +6,5 @@ - common-config untrusted-projects: - org/project - - org/plugin-project - bare-role - org/ansible diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py index 2dbae108b..37083e676 100644 --- a/tests/unit/test_v3.py +++ b/tests/unit/test_v3.py @@ -3724,101 +3724,6 @@ class FunctionalAnsibleMixIn(object): dict(name='hello-ansible', result='SUCCESS', changes='1,1'), ]) - def _add_job(self, job_name): - conf = textwrap.dedent( - """ - - job: - name: {job_name} - run: playbooks/{job_name}.yaml - ansible-version: {ansible_version} - - - project: - check: - jobs: - - {job_name} - """.format(job_name=job_name, - ansible_version=self.ansible_version)) - - file_dict = {'.zuul.yaml': conf} - A = self.fake_gerrit.addFakeChange('org/plugin-project', 'master', 'A', - files=file_dict) - self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) - - def _test_plugins(self, plugin_tests): - # This test runs a bit long and needs extra time. - self.wait_timeout = 180 - - # Keep the jobdir around so we can inspect contents if an - # assert fails. - self.executor_server.keep_jobdir = True - # Output extra ansible info so we might see errors. - self.executor_server.verbose = True - - count = 0 - - # Kick off all test jobs in parallel - for job_name, result in plugin_tests: - count += 1 - self._add_job(job_name) - # Wait for all jobs to complete - self.waitUntilSettled() - - # Check the correct number of jobs ran - self.assertEqual(count, len(self.history)) - # Check the job results - for job_name, result in plugin_tests: - build = self.getJobFromHistory(job_name) - with self.jobLog(build): - self.assertEqual(build.result, result) - - # TODOv3(jeblair): parse the ansible output and verify we're - # getting the exception we expect. - - def test_plugins_collections(self): - plugin_tests = [ - ('collections_bad', 'FAILURE'), - ] - self._test_plugins(plugin_tests) - - def test_plugins_1(self): - ''' - Split plugin tests to avoid timeouts and exceeding subunit - report lengths. - ''' - plugin_tests = [ - ('passwd', 'FAILURE'), - ('cartesian', 'SUCCESS'), - ('consul_kv', 'FAILURE'), - ('credstash', 'FAILURE'), - ('csvfile_good', 'SUCCESS'), - ('csvfile_bad', 'FAILURE'), - ('uri_bad_path', 'FAILURE'), - ('uri_bad_scheme', 'FAILURE'), - ] - self._test_plugins(plugin_tests) - - def test_plugins_2(self): - ''' - Split plugin tests to avoid timeouts and exceeding subunit - report lengths. - ''' - plugin_tests = [ - ('block_local_override', 'FAILURE'), - ('file_local_good', 'SUCCESS'), - ('file_local_bad', 'FAILURE'), - ('fileglob_local_good', 'SUCCESS'), - ('fileglob_local_bad', 'FAILURE'), - ('find_local_good', 'SUCCESS'), - ('find_local_bad', 'FAILURE'), - ('zuul_return', 'SUCCESS'), - ('password_create_good', 'SUCCESS'), - ('password_null_good', 'SUCCESS'), - ('password_read_good', 'SUCCESS'), - ('password_create_bad', 'FAILURE'), - ('password_read_bad', 'FAILURE'), - ] - self._test_plugins(plugin_tests) - class TestAnsible28(AnsibleZuulTestCase, FunctionalAnsibleMixIn): ansible_version = '2.8' |