Browse Source

Merge "Remove workaround for tox-ansible and global molecule config"

changes/66/782666/2
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
ae6c7e506d
31 changed files with 4 additions and 61 deletions
  1. +1
    -1
      .config/molecule/config.yml
  2. +0
    -1
      validations_common/roles/advanced_format_512e_support/molecule/default/Dockerfile
  3. +0
    -3
      validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
  4. +0
    -1
      validations_common/roles/check_cpu/molecule/default/Dockerfile
  5. +0
    -3
      validations_common/roles/check_cpu/molecule/default/molecule.yml
  6. +0
    -1
      validations_common/roles/check_disk_space/molecule/default/Dockerfile
  7. +0
    -3
      validations_common/roles/check_disk_space/molecule/default/molecule.yml
  8. +0
    -1
      validations_common/roles/check_latest_packages_version/molecule/default/Dockerfile
  9. +0
    -3
      validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
  10. +0
    -1
      validations_common/roles/check_ram/molecule/default/Dockerfile
  11. +0
    -3
      validations_common/roles/check_ram/molecule/default/molecule.yml
  12. +0
    -1
      validations_common/roles/check_selinux_mode/molecule/default/Dockerfile
  13. +0
    -3
      validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
  14. +0
    -1
      validations_common/roles/dns/molecule/default/Dockerfile
  15. +0
    -3
      validations_common/roles/dns/molecule/default/molecule.yml
  16. +0
    -1
      validations_common/roles/haproxy/molecule/default/Dockerfile
  17. +0
    -3
      validations_common/roles/haproxy/molecule/default/molecule.yml
  18. +0
    -1
      validations_common/roles/ntp/molecule/default/Dockerfile
  19. +0
    -3
      validations_common/roles/ntp/molecule/default/molecule.yml
  20. +0
    -1
      validations_common/roles/service_status/molecule/default/Dockerfile
  21. +1
    -4
      validations_common/roles/service_status/molecule/default/molecule.yml
  22. +0
    -1
      validations_common/roles/service_status/molecule/docker/Dockerfile
  23. +1
    -1
      validations_common/roles/service_status/molecule/docker/molecule.yml
  24. +0
    -1
      validations_common/roles/service_status/molecule/podman/Dockerfile
  25. +0
    -3
      validations_common/roles/service_status/molecule/podman/molecule.yml
  26. +0
    -1
      validations_common/roles/service_status/molecule/systemd/Dockerfile
  27. +1
    -4
      validations_common/roles/service_status/molecule/systemd/molecule.yml
  28. +0
    -1
      validations_common/roles/validate_selinux/molecule/default/Dockerfile
  29. +0
    -3
      validations_common/roles/validate_selinux/molecule/default/molecule.yml
  30. +0
    -1
      validations_common/roles/xfs_check_ftype/molecule/default/Dockerfile
  31. +0
    -3
      validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml

+ 1
- 1
.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


+ 0
- 1
validations_common/roles/advanced_format_512e_support/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/check_cpu/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/check_disk_space/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/check_latest_packages_version/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/check_ram/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/check_selinux_mode/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/dns/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/haproxy/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/ntp/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/service_status/molecule/default/Dockerfile View File

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

+ 1
- 4
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:


+ 0
- 1
validations_common/roles/service_status/molecule/docker/Dockerfile View File

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

+ 1
- 1
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:


+ 0
- 1
validations_common/roles/service_status/molecule/podman/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/service_status/molecule/systemd/Dockerfile View File

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

+ 1
- 4
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


+ 0
- 1
validations_common/roles/validate_selinux/molecule/default/Dockerfile View File

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

+ 0
- 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

+ 0
- 1
validations_common/roles/xfs_check_ftype/molecule/default/Dockerfile View File

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

+ 0
- 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

Loading…
Cancel
Save