Merge "Remove workaround for tox-ansible and global molecule config" into stable/train
This commit is contained in:
commit
df1d1955cf
|
@ -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 +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 {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:
|
||||
|
|
|
@ -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
|
|
@ -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…
Reference in New Issue