Optimize linters executions from tox and pre-commit

This patch merges all the tox linters testenv into one. It also installs
the required Ansible collections with ansible-galaxy before executing
ansible-lint.

Morever, the 'end-of-file-fixer' pre-commit hook is working again and
this patch is fixing all the related issues.

Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
Change-Id: Ib823c6c65b4853e951cb001a6eed354ba2127965

.pre-commit-config.yaml

@@ -11,7 +11,6 @@ repos:
       - id: check-merge-conflict
       - id: check-symlinks
       - id: debug-statements
-      - id: check-yaml
         files: .*\.(yaml|yml)$
 
   - repo: https://gitlab.com/pycqa/flake8

LICENSE

@@ -173,4 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-

README.rst

@@ -20,4 +20,3 @@ or by Ansible directly.
 * Release notes: https://docs.openstack.org/releasenotes/tripleo-validations/
 * Source: https://opendev.org/openstack/tripleo-validations
 * Bugs: https://storyboard.openstack.org/#!/project/openstack/tripleo-validations
-

babel.cfg

@@ -1,2 +1 @@
 [python: **.py]
-

doc/source/modules.rst

@@ -7,4 +7,3 @@ Contents:
    :glob:
 
    modules/*
-

doc/source/modules/modules-ceph_pools_pg_protection.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/ceph_pools_pg_protection.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-check_cpus_aligned_with_dpdk_nics.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/check_cpus_aligned_with_dpdk_nics.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-check_flavors.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/check_flavors.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-check_ironic_boot_config.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/check_ironic_boot_config.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-check_other_processes_pmd_usage.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/check_other_processes_pmd_usage.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-convert_range_to_numbers_list.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/convert_range_to_numbers_list.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-get_dpdk_nics_numa_info.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/get_dpdk_nics_numa_info.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-icmp_ping.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/icmp_ping.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-ip_range.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/ip_range.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-network_environment.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/network_environment.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-node_disks.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/node_disks.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-ovs_dpdk_pmd_cpus_check.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/ovs_dpdk_pmd_cpus_check.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-pacemaker.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/pacemaker.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-pmd_threads_siblings_check.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/pmd_threads_siblings_check.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-switch_vlans.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/switch_vlans.py
    :documentation: true
    :examples: true
-

doc/source/modules/modules-verify_profiles.rst

@@ -12,4 +12,3 @@ This module provides for the following ansible plugin:
    :module: library/verify_profiles.py
    :documentation: true
    :examples: true
-

doc/source/roles.rst

@@ -7,4 +7,3 @@ Contents:
    :glob:
 
    roles/*
-

doc/source/roles/role-ceph.rst

@@ -4,4 +4,3 @@ ceph
 
 .. ansibleautoplugin::
    :role: roles/ceph
-

doc/source/roles/role-check_network_gateway.rst

@@ -4,4 +4,3 @@ check_network_gateway
 
 .. ansibleautoplugin::
    :role: roles/check_network_gateway
-

doc/source/roles/role-collect_flavors_and_verify_profiles.rst

@@ -4,4 +4,3 @@ collect_flavors_and_verify_profiles
 
 .. ansibleautoplugin::
    :role: roles/collect_flavors_and_verify_profiles
-

doc/source/roles/role-compute_tsx.rst

@@ -71,4 +71,3 @@ Full Description
 
 .. ansibleautoplugin::
    :role: roles/compute_tsx
-

doc/source/roles/role-controller_token.rst

@@ -4,4 +4,3 @@ controller_token
 
 .. ansibleautoplugin::
    :role: roles/controller_token
-

doc/source/roles/role-controller_ulimits.rst

@@ -4,4 +4,3 @@ controller_ulimits
 
 .. ansibleautoplugin::
    :role: roles/controller_ulimits
-

doc/source/roles/role-ctlplane_ip_range.rst

@@ -4,4 +4,3 @@ ctlplane_ip_range
 
 .. ansibleautoplugin::
    :role: roles/ctlplane_ip_range
-

doc/source/roles/role-default_node_count.rst

@@ -4,4 +4,3 @@ default_node_count
 
 .. ansibleautoplugin::
    :role: roles/default_node_count
-

doc/source/roles/role-dhcp_validations.rst

@@ -4,4 +4,3 @@ dhcp_validations
 
 .. ansibleautoplugin::
    :role: roles/dhcp_validations
-

doc/source/roles/role-frr_status.rst

@@ -4,4 +4,3 @@ frr_status
 
 .. ansibleautoplugin::
    :role: roles/frr_status
-

doc/source/roles/role-image_serve.rst

@@ -4,4 +4,3 @@ image_serve
 
 .. ansibleautoplugin::
    :role: roles/image_serve
-

doc/source/roles/role-ironic_boot_configuration.rst

@@ -4,4 +4,3 @@ ironic_boot_configuration
 
 .. ansibleautoplugin::
    :role: roles/ironic_boot_configuration
-

doc/source/roles/role-mysql_open_files_limit.rst

@@ -4,4 +4,3 @@ mysql_open_files_limit
 
 .. ansibleautoplugin::
    :role: roles/mysql_open_files_limit
-

doc/source/roles/role-network_environment.rst

@@ -4,4 +4,3 @@ network_environment
 
 .. ansibleautoplugin::
    :role: roles/network_environment
-

doc/source/roles/role-neutron_sanity_check.rst

@@ -4,4 +4,3 @@ neutron_sanity_check
 
 .. ansibleautoplugin::
    :role: roles/neutron_sanity_check
-

doc/source/roles/role-node_disks.rst

@@ -4,4 +4,3 @@ node_disks
 
 .. ansibleautoplugin::
    :role: roles/node_disks
-

doc/source/roles/role-node_health.rst

@@ -4,4 +4,3 @@ node_health
 
 .. ansibleautoplugin::
    :role: roles/node_health
-

doc/source/roles/role-nova_event_callback.rst

@@ -46,4 +46,3 @@ Full Description
 
 .. ansibleautoplugin::
    :role: roles/nova_event_callback
-

doc/source/roles/role-nova_status.rst

@@ -4,4 +4,3 @@ nova_status
 
 .. ansibleautoplugin::
    :role: roles/nova_status
-

doc/source/roles/role-openshift_on_openstack.rst

@@ -4,4 +4,3 @@ openshift_on_openstack
 
 .. ansibleautoplugin::
    :role: roles/openshift_on_openstack
-

doc/source/roles/role-openstack_endpoints.rst

@@ -4,4 +4,3 @@ openstack_endpoints
 
 .. ansibleautoplugin::
    :role: roles/openstack_endpoints
-

doc/source/roles/role-overcloud_service_status.rst

@@ -45,4 +45,3 @@ Full Description
 
 .. ansibleautoplugin::
    :role: roles/overcloud_service_status
-

doc/source/roles/role-ovs_dpdk_pmd.rst

@@ -4,4 +4,3 @@ ovs_dpdk_pmd
 
 .. ansibleautoplugin::
    :role: roles/ovs_dpdk_pmd
-

doc/source/roles/role-pacemaker_status.rst

@@ -4,4 +4,3 @@ pacemaker_status
 
 .. ansibleautoplugin::
    :role: roles/pacemaker_status
-

doc/source/roles/role-rabbitmq_limits.rst

@@ -4,4 +4,3 @@ rabbitmq_limits
 
 .. ansibleautoplugin::
    :role: roles/rabbitmq_limits
-

doc/source/roles/role-repos.rst

@@ -4,4 +4,3 @@ repos
 
 .. ansibleautoplugin::
    :role: roles/repos
-

doc/source/roles/role-stack_health.rst

@@ -4,4 +4,3 @@ stack_health
 
 .. ansibleautoplugin::
    :role: roles/stack_health
-

doc/source/roles/role-stonith_exists.rst

@@ -4,4 +4,3 @@ stonith_exists
 
 .. ansibleautoplugin::
    :role: roles/stonith_exists
-

doc/source/roles/role-switch_vlans.rst

@@ -4,4 +4,3 @@ switch_vlans
 
 .. ansibleautoplugin::
    :role: roles/switch_vlans
-

doc/source/roles/role-tls_everywhere.rst

@@ -4,4 +4,3 @@ tls_everywhere
 
 .. ansibleautoplugin::
    :role: roles/tls_everywhere
-

doc/source/roles/role-undercloud_debug.rst

@@ -4,4 +4,3 @@ undercloud_debug
 
 .. ansibleautoplugin::
    :role: roles/undercloud_debug
-

doc/source/roles/role-undercloud_disk_space.rst

@@ -4,4 +4,3 @@ undercloud_disk_space
 
 .. ansibleautoplugin::
    :role: roles/undercloud_disk_space
-

doc/source/roles/role-undercloud_heat_purge_deleted.rst

@@ -4,4 +4,3 @@ undercloud_heat_purge_deleted
 
 .. ansibleautoplugin::
    :role: roles/undercloud_heat_purge_deleted
-

doc/source/roles/role-undercloud_process_count.rst

@@ -4,4 +4,3 @@ undercloud_process_count
 
 .. ansibleautoplugin::
    :role: roles/undercloud_process_count
-

doc/source/roles/role-undercloud_service_status.rst

@@ -4,4 +4,3 @@ undercloud_service_status
 
 .. ansibleautoplugin::
    :role: roles/undercloud_service_status
-

test-requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0  # GPLv3+
+ansible-core<2.12.0  # GPLv3+
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 sphinx>=2.0.0,!=2.1.0 # BSD

tox.ini

@@ -35,7 +35,9 @@ deps =
     -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
-whitelist_externals = bash
+whitelist_externals =
+    bash
+    ansible-galaxy
 
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
@@ -48,57 +50,15 @@ commands = bindep test
 [testenv:debug]
 commands = oslo_debug_helper {posargs}
 
-[testenv:pep8]
-envdir = {toxworkdir}/linters
-commands =
-    python -m pre_commit run flake8 -a
-
-[testenv:ansible-lint]
-envdir = {toxworkdir}/linters
-deps =
-  {[testenv:linters]deps}
-commands =
-  bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/roles'"
-  bash -c "ANSIBLE_LIBRARY='{toxinidir}/library'"
-  python -m pre_commit run ansible-lint -a
-
-[testenv:yamllint]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run yamllint -a
-
-[testenv:bashate]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run bashate -a
-
-[testenv:whitespace]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run trailing-whitespace -a
-
-[testenv:shebangs]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run check-executables-have-shebangs -a
-
 [testenv:linters]
 deps =
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
     -r {toxinidir}/molecule-requirements.txt
 commands =
+    ansible-galaxy install -fr {toxinidir}/ansible-collections-requirements.yml
     python '{toxinidir}/tools/validate-files.py' .
-    {[testenv:pep8]commands}
+    python -m pre_commit run -a
-    {[testenv:ansible-lint]commands}
-    {[testenv:yamllint]commands}
-    {[testenv:bashate]commands}
-    {[testenv:whitespace]commands}
-    {[testenv:shebangs]commands}
 
 [testenv:releasenotes]
 deps = -r{toxinidir}/doc/requirements.txt