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
This commit is contained in:
Gael Chamoulaud (Strider) 2021-05-17 09:13:26 +02:00
parent e7b320a7f7
commit c551910cf5
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
107 changed files with 4 additions and 216 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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