Remove workaround for tox-ansible and global molecule config

[1] has been merged and released[2] in upstream tox-ansible and it is now
able to manage global molecule configuration. The workaround, which
consisted in adding the molecule driver name in each scenarios
molecule.yml files, is not necessary anymore.

This patch also removes all the relative symlink to the Dockerfile and
adds directly in the global molecule configuration file.

[1] https://github.com/ansible-community/tox-ansible/pull/89
[2] https://github.com/ansible-community/tox-ansible/releases/tag/v1.5.0

Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
Change-Id: I259c17b7a49ff5bf3476df4da399cc4b2782403d
(cherry picked from commit c551910cf5)
(cherry picked from commit f3cba823d7)
(cherry picked from commit 12dd20e3b5)
(cherry picked from commit 76eb983e98)
changes/69/795969/2
Gael Chamoulaud (Strider) 1 year ago
parent 773594db4e
commit 760e0b401c
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
  1. 2
      .config/molecule/config.yml
  2. 3
      roles/ceilometerdb_size/molecule/default/molecule.yml
  3. 1
      roles/ceph/molecule/ceph-ansible-installed/Dockerfile
  4. 3
      roles/ceph/molecule/ceph-ansible-installed/molecule.yml
  5. 1
      roles/ceph/molecule/default/Dockerfile
  6. 3
      roles/ceph/molecule/default/molecule.yml
  7. 1
      roles/check_for_dangling_images/molecule/default/Dockerfile
  8. 3
      roles/check_for_dangling_images/molecule/default/molecule.yml
  9. 1
      roles/check_network_gateway/molecule/default/Dockerfile
  10. 7
      roles/check_network_gateway/molecule/default/molecule.yml
  11. 1
      roles/check_rhsm_version/molecule/default/Dockerfile
  12. 3
      roles/check_rhsm_version/molecule/default/molecule.yml
  13. 1
      roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile
  14. 3
      roles/check_rhsm_version/molecule/rhsm_mismatch/molecule.yml
  15. 1
      roles/check_uc_hostname/molecule/default/Dockerfile
  16. 3
      roles/check_uc_hostname/molecule/default/molecule.yml
  17. 1
      roles/check_undercloud_conf/molecule/config_OK/Dockerfile
  18. 3
      roles/check_undercloud_conf/molecule/config_OK/molecule.yml
  19. 1
      roles/check_undercloud_conf/molecule/default/Dockerfile
  20. 3
      roles/check_undercloud_conf/molecule/default/molecule.yml
  21. 1
      roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile
  22. 3
      roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
  23. 1
      roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile
  24. 3
      roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
  25. 1
      roles/check_undercloud_conf/molecule/required_missing/Dockerfile
  26. 3
      roles/check_undercloud_conf/molecule/required_missing/molecule.yml
  27. 1
      roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile
  28. 3
      roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml
  29. 1
      roles/container_status/molecule/default/Dockerfile
  30. 3
      roles/container_status/molecule/default/molecule.yml
  31. 1
      roles/controller_token/molecule/default/Dockerfile
  32. 3
      roles/controller_token/molecule/default/molecule.yml
  33. 1
      roles/controller_ulimits/molecule/default/Dockerfile
  34. 3
      roles/controller_ulimits/molecule/default/molecule.yml
  35. 1
      roles/ctlplane_ip_range/molecule/default/Dockerfile
  36. 3
      roles/ctlplane_ip_range/molecule/default/molecule.yml
  37. 1
      roles/dhcp_validations/molecule/default/Dockerfile
  38. 3
      roles/dhcp_validations/molecule/default/molecule.yml
  39. 1
      roles/healthcheck_service_status/molecule/default/Dockerfile
  40. 3
      roles/healthcheck_service_status/molecule/default/molecule.yml
  41. 1
      roles/image_serve/molecule/default/Dockerfile
  42. 5
      roles/image_serve/molecule/default/molecule.yml
  43. 1
      roles/ironic_boot_configuration/molecule/default/Dockerfile
  44. 3
      roles/ironic_boot_configuration/molecule/default/molecule.yml
  45. 1
      roles/mysql_open_files_limit/molecule/default/Dockerfile
  46. 3
      roles/mysql_open_files_limit/molecule/default/molecule.yml
  47. 1
      roles/network_environment/molecule/default/Dockerfile
  48. 3
      roles/network_environment/molecule/default/molecule.yml
  49. 1
      roles/neutron_sanity_check/molecule/default/Dockerfile
  50. 3
      roles/neutron_sanity_check/molecule/default/molecule.yml
  51. 1
      roles/no_op_firewall_nova_driver/molecule/default/Dockerfile
  52. 3
      roles/no_op_firewall_nova_driver/molecule/default/molecule.yml
  53. 1
      roles/node_disks/molecule/default/Dockerfile
  54. 3
      roles/node_disks/molecule/default/molecule.yml
  55. 1
      roles/node_health/molecule/default/Dockerfile
  56. 3
      roles/node_health/molecule/default/molecule.yml
  57. 1
      roles/nova_event_callback/molecule/default/Dockerfile
  58. 3
      roles/nova_event_callback/molecule/default/molecule.yml
  59. 1
      roles/nova_status/molecule/default/Dockerfile
  60. 3
      roles/nova_status/molecule/default/molecule.yml
  61. 1
      roles/nova_svirt/molecule/default/Dockerfile
  62. 3
      roles/nova_svirt/molecule/default/molecule.yml
  63. 1
      roles/openshift_on_openstack/molecule/default/Dockerfile
  64. 3
      roles/openshift_on_openstack/molecule/default/molecule.yml
  65. 1
      roles/openstack_endpoints/molecule/default/Dockerfile
  66. 3
      roles/openstack_endpoints/molecule/default/molecule.yml
  67. 1
      roles/overcloud_service_status/molecule/default/Dockerfile
  68. 3
      roles/overcloud_service_status/molecule/default/molecule.yml
  69. 1
      roles/overcloud_service_status/molecule/deprecated_services/Dockerfile
  70. 3
      roles/overcloud_service_status/molecule/deprecated_services/molecule.yml
  71. 1
      roles/overcloud_service_status/molecule/down_services/Dockerfile
  72. 3
      roles/overcloud_service_status/molecule/down_services/molecule.yml
  73. 1
      roles/ovs_dpdk_pmd/molecule/default/Dockerfile
  74. 3
      roles/ovs_dpdk_pmd/molecule/default/molecule.yml
  75. 1
      roles/pacemaker_status/molecule/default/Dockerfile
  76. 3
      roles/pacemaker_status/molecule/default/molecule.yml
  77. 1
      roles/rabbitmq_limits/molecule/default/Dockerfile
  78. 3
      roles/rabbitmq_limits/molecule/default/molecule.yml
  79. 1
      roles/repos/molecule/default/Dockerfile
  80. 3
      roles/repos/molecule/default/molecule.yml
  81. 1
      roles/stack_health/molecule/default/Dockerfile
  82. 3
      roles/stack_health/molecule/default/molecule.yml
  83. 1
      roles/stonith_exists/molecule/default/Dockerfile
  84. 3
      roles/stonith_exists/molecule/default/molecule.yml
  85. 1
      roles/switch_vlans/molecule/default/Dockerfile
  86. 3
      roles/switch_vlans/molecule/default/molecule.yml
  87. 1
      roles/system_encoding/molecule/default/Dockerfile
  88. 3
      roles/system_encoding/molecule/default/molecule.yml
  89. 1
      roles/tls_everywhere/molecule/default/Dockerfile
  90. 5
      roles/tls_everywhere/molecule/default/molecule.yml
  91. 1
      roles/undercloud_debug/molecule/default/Dockerfile
  92. 3
      roles/undercloud_debug/molecule/default/molecule.yml
  93. 1
      roles/undercloud_disk_space/molecule/default/Dockerfile
  94. 3
      roles/undercloud_disk_space/molecule/default/molecule.yml
  95. 1
      roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile
  96. 3
      roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml
  97. 1
      roles/undercloud_process_count/molecule/default/Dockerfile
  98. 3
      roles/undercloud_process_count/molecule/default/molecule.yml
  99. 1
      roles/undercloud_tokenflush/molecule/default/Dockerfile
  100. 3
      roles/undercloud_tokenflush/molecule/default/molecule.yml
  101. Some files were not shown because too many files have changed in this diff Show More

@ -30,7 +30,7 @@ platforms:
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
dockerfile: ../../../../.config/molecule/Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -2,17 +2,14 @@
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
platforms:
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*setuptools python*-PyYAML iputils
dockerfile: ../../../../.config/molecule/Dockerfile
pkg_extras: python*setuptools python*-pyyaml iputils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
privileged: true

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -2,9 +2,6 @@
# inherits {REPO}/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
platforms:
- name: ubi8
hostname: ubi8
@ -13,7 +10,7 @@ platforms:
url: registry.access.redhat.com
etc_hosts:
undercloud.ctlplane.mydomain.tld: "127.0.0.1"
dockerfile: Dockerfile
dockerfile: ../../../../.config/molecule/Dockerfile
override_command: true
command: /sbin/init
privileged: true

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -2,9 +2,6 @@
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
provisioner:
name: ansible
playbooks:

@ -2,9 +2,6 @@
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
provisioner:
name: ansible
playbooks:

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -2,9 +2,6 @@
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
provisioner:
name: ansible
playbooks:

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -2,16 +2,13 @@
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman
platforms:
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
dockerfile: ../../../../.config/molecule/Dockerfile
pkg_extras: python*-setuptools python*-pyyaml krb5-workstation
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

@ -1 +0,0 @@
../../../../.config/molecule/Dockerfile

@ -1,6 +1,3 @@
---
# inherits tripleo-validations/.config/molecule/config.yml
# To override default values, please take a look at the config.yml.
driver:
name: podman

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save