openstack
/
validations-common
Code Issues Proposed changes

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

Change-Id: I8ac3f731c9d6af983dd902fc94e06a07c2ab9954
Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud (Strider) 2021-05-17 09:34:32 +02:00
parent 7f196ad2bd
commit 1f3c0d2e7b
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
31 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/molecule/config.yml
View File

@ -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
validations_common/roles/advanced_format_512e_support/molecule/default/Dockerfile
View File

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

3
validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/check_cpu/molecule/default/Dockerfile
View File

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

3
validations_common/roles/check_cpu/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/check_disk_space/molecule/default/Dockerfile
View File

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

3
validations_common/roles/check_disk_space/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/check_latest_packages_version/molecule/default/Dockerfile
View File

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

3
validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/check_ram/molecule/default/Dockerfile
View File

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

3
validations_common/roles/check_ram/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/check_selinux_mode/molecule/default/Dockerfile
View File

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

3
validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/dns/molecule/default/Dockerfile
View File

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

3
validations_common/roles/dns/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/haproxy/molecule/default/Dockerfile
View File

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

3
validations_common/roles/haproxy/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/ntp/molecule/default/Dockerfile
View File

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

3
validations_common/roles/ntp/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/service_status/molecule/default/Dockerfile
View File

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

5
validations_common/roles/service_status/molecule/default/molecule.yml
View File

@ -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
command: /sbin/init
pkg_extras: python*-setuptools python*-pyyaml
volumes:

1
validations_common/roles/service_status/molecule/docker/Dockerfile
View File

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

2
validations_common/roles/service_status/molecule/docker/molecule.yml
View File

@ -11,7 +11,7 @@ platforms:
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
dockerfile: ../../../../../.config/molecule/Dockerfile
pkg_extras: python*-setuptools python*-pyyaml python*-libselinux
command: /sbin/init
capabilities:

1
validations_common/roles/service_status/molecule/podman/Dockerfile
View File

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

3
validations_common/roles/service_status/molecule/podman/molecule.yml
View File

@ -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
validations_common/roles/service_status/molecule/systemd/Dockerfile
View File

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

5
validations_common/roles/service_status/molecule/systemd/molecule.yml
View File

@ -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
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

1
validations_common/roles/validate_selinux/molecule/default/Dockerfile
View File

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

3
validations_common/roles/validate_selinux/molecule/default/molecule.yml
View File

@ -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
validations_common/roles/xfs_check_ftype/molecule/default/Dockerfile
View File

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

3
validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml
View File

@ -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