diff --git a/Makefile b/Makefile index 55b65fa2c5..7ce3323339 100644 --- a/Makefile +++ b/Makefile @@ -403,7 +403,6 @@ test_collection_sanity: rm -rf sanity mkdir -p sanity/ansible_collections/awx cp -Ra awx_collection sanity/ansible_collections/awx/awx # symlinks do not work - cd sanity/ansible_collections/awx/awx && ansible-playbook -i localhost, make_imports_absolute.yml # hack because sanity tests do not fully work cd sanity/ansible_collections/awx/awx && git init && git add . # requires both this file structure and a git repo, so there you go cd sanity/ansible_collections/awx/awx && ansible-test sanity --test validate-modules diff --git a/awx_collection/make_imports_absolute.yml b/awx_collection/make_imports_absolute.yml deleted file mode 100644 index 184019ea2b..0000000000 --- a/awx_collection/make_imports_absolute.yml +++ /dev/null @@ -1,17 +0,0 @@ -- hosts: localhost - gather_facts: false - connection: local - - tasks: - - name: Find all module files - find: - paths: "{{ playbook_dir }}/plugins/modules" - patterns: "*.py" - register: module_files - - - name: Change module_utils imports to absolute namespace and package names - replace: - path: "{{ item.path }}" - regexp: '^from ..module_utils.ansible_tower' - replace: 'from ansible_collections.awx.awx.plugins.module_utils.ansible_tower' - with_items: "{{ module_files.files }}" diff --git a/awx_collection/tests/sanity/ignore-2.10.txt b/awx_collection/tests/sanity/ignore-2.10.txt index b97a2b4060..4d3942ddf0 100644 --- a/awx_collection/tests/sanity/ignore-2.10.txt +++ b/awx_collection/tests/sanity/ignore-2.10.txt @@ -17,4 +17,28 @@ plugins/modules/tower_settings.py validate-modules:missing-module-utils-import plugins/modules/tower_team.py validate-modules:missing-module-utils-import plugins/modules/tower_user.py validate-modules:missing-module-utils-import plugins/modules/tower_workflow_launch.py validate-modules:missing-module-utils-import -plugins/modules/tower_workflow_template.py validate-modules:missing-module-utils-import \ No newline at end of file +plugins/modules/tower_workflow_template.py validate-modules:missing-module-utils-import +plugins/modules/tower_credential_type.py validate-modules:import-error +plugins/modules/tower_credential.py validate-modules:import-error +plugins/modules/tower_group.py validate-modules:import-error +plugins/modules/tower_host.py validate-modules:import-error +plugins/modules/tower_inventory.py validate-modules:import-error +plugins/modules/tower_inventory_source.py validate-modules:import-error +plugins/modules/tower_job_cancel.py validate-modules:import-error +plugins/modules/tower_job_launch.py validate-modules:import-error +plugins/modules/tower_job_list.py validate-modules:import-error +plugins/modules/tower_job_wait.py validate-modules:import-error +plugins/modules/tower_job_template.py validate-modules:import-error +plugins/modules/tower_label.py validate-modules:import-error +plugins/modules/tower_notification.py validate-modules:import-error +plugins/modules/tower_organization.py validate-modules:import-error +plugins/modules/tower_project.py validate-modules:import-error +plugins/modules/tower_receive.py validate-modules:import-error +plugins/modules/tower_role.py validate-modules:import-error +plugins/modules/tower_settings.py validate-modules:import-error +plugins/modules/tower_send.py validate-modules:import-error +plugins/modules/tower_team.py validate-modules:import-error +plugins/modules/tower_user.py validate-modules:import-error +plugins/modules/tower_workflow_launch.py validate-modules:import-error +plugins/modules/tower_workflow_template.py validate-modules:import-error +plugins/modules/tower_workflow_job_template.py validate-modules:import-error \ No newline at end of file diff --git a/awx_collection/tests/sanity/ignore-2.9.txt b/awx_collection/tests/sanity/ignore-2.9.txt index b97a2b4060..4d3942ddf0 100644 --- a/awx_collection/tests/sanity/ignore-2.9.txt +++ b/awx_collection/tests/sanity/ignore-2.9.txt @@ -17,4 +17,28 @@ plugins/modules/tower_settings.py validate-modules:missing-module-utils-import plugins/modules/tower_team.py validate-modules:missing-module-utils-import plugins/modules/tower_user.py validate-modules:missing-module-utils-import plugins/modules/tower_workflow_launch.py validate-modules:missing-module-utils-import -plugins/modules/tower_workflow_template.py validate-modules:missing-module-utils-import \ No newline at end of file +plugins/modules/tower_workflow_template.py validate-modules:missing-module-utils-import +plugins/modules/tower_credential_type.py validate-modules:import-error +plugins/modules/tower_credential.py validate-modules:import-error +plugins/modules/tower_group.py validate-modules:import-error +plugins/modules/tower_host.py validate-modules:import-error +plugins/modules/tower_inventory.py validate-modules:import-error +plugins/modules/tower_inventory_source.py validate-modules:import-error +plugins/modules/tower_job_cancel.py validate-modules:import-error +plugins/modules/tower_job_launch.py validate-modules:import-error +plugins/modules/tower_job_list.py validate-modules:import-error +plugins/modules/tower_job_wait.py validate-modules:import-error +plugins/modules/tower_job_template.py validate-modules:import-error +plugins/modules/tower_label.py validate-modules:import-error +plugins/modules/tower_notification.py validate-modules:import-error +plugins/modules/tower_organization.py validate-modules:import-error +plugins/modules/tower_project.py validate-modules:import-error +plugins/modules/tower_receive.py validate-modules:import-error +plugins/modules/tower_role.py validate-modules:import-error +plugins/modules/tower_settings.py validate-modules:import-error +plugins/modules/tower_send.py validate-modules:import-error +plugins/modules/tower_team.py validate-modules:import-error +plugins/modules/tower_user.py validate-modules:import-error +plugins/modules/tower_workflow_launch.py validate-modules:import-error +plugins/modules/tower_workflow_template.py validate-modules:import-error +plugins/modules/tower_workflow_job_template.py validate-modules:import-error \ No newline at end of file