Browse Source

Use the UBI8 image for testing

check_undercloud_conf was modified by ca884424f4
This patch unifies check_undercloud_conf to the same standards as other
roles

Change-Id: I6b3027ecb806e9c286b4bd493d2a0eb267e6ddeb
changes/39/786339/2
Sergii Golovatiuk 3 weeks ago
parent
commit
3b12012697
16 changed files with 97 additions and 20 deletions
  1. +0
    -0
      roles/check_undercloud_conf/molecule/config_OK/Dockerfile
  2. +18
    -4
      roles/check_undercloud_conf/molecule/config_OK/molecule.yml
  3. +1
    -0
      roles/check_undercloud_conf/molecule/config_OK/prepare.yml
  4. +0
    -0
      roles/check_undercloud_conf/molecule/default/Dockerfile
  5. +18
    -4
      roles/check_undercloud_conf/molecule/default/molecule.yml
  6. +1
    -0
      roles/check_undercloud_conf/molecule/default/prepare.yml
  7. +0
    -0
      roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile
  8. +18
    -4
      roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
  9. +1
    -0
      roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml
  10. +0
    -0
      roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile
  11. +18
    -4
      roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
  12. +1
    -0
      roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml
  13. +0
    -0
      roles/check_undercloud_conf/molecule/required_missing/Dockerfile
  14. +18
    -4
      roles/check_undercloud_conf/molecule/required_missing/molecule.yml
  15. +1
    -0
      roles/check_undercloud_conf/molecule/required_missing/prepare.yml
  16. +2
    -0
      roles/check_undercloud_conf/tasks/main.yml

roles/check_undercloud_conf/molecule/config_OK/Dockerfile.j2 → roles/check_undercloud_conf/molecule/config_OK/Dockerfile View File


+ 18
- 4
roles/check_undercloud_conf/molecule/config_OK/molecule.yml View File

@ -5,12 +5,18 @@ driver:
log: true
platforms:
- name: centos8
hostname: centos8
image: centos:8
pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
@ -21,6 +27,14 @@ provisioner:
name: ansible
options:
vvv: true
inventory:
hosts:
all:
hosts:
ubi8:
ansible_python_interpreter: /usr/bin/python3
vars:
ansible_user: root
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml


+ 1
- 0
roles/check_undercloud_conf/molecule/config_OK/prepare.yml View File

@ -26,6 +26,7 @@
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: "{{ ansible_env.HOME }}/undercloud.conf"


roles/check_undercloud_conf/molecule/default/Dockerfile.j2 → roles/check_undercloud_conf/molecule/default/Dockerfile View File


+ 18
- 4
roles/check_undercloud_conf/molecule/default/molecule.yml View File

@ -5,12 +5,18 @@ driver:
log: true
platforms:
- name: centos8
hostname: centos8
image: centos:8
pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
@ -21,6 +27,14 @@ provisioner:
name: ansible
options:
vvv: true
inventory:
hosts:
all:
hosts:
ubi8:
ansible_python_interpreter: /usr/bin/python3
vars:
ansible_user: root
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml


+ 1
- 0
roles/check_undercloud_conf/molecule/default/prepare.yml View File

@ -25,6 +25,7 @@
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: "{{ ansible_env.HOME }}/undercloud.conf"


roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile.j2 → roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile View File


+ 18
- 4
roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml View File

@ -5,12 +5,18 @@ driver:
log: true
platforms:
- name: centos8
hostname: centos8
image: centos:8
pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
@ -21,6 +27,14 @@ provisioner:
name: ansible
options:
vvv: true
inventory:
hosts:
all:
hosts:
ubi8:
ansible_python_interpreter: /usr/bin/python3
vars:
ansible_user: root
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml


+ 1
- 0
roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml View File

@ -26,6 +26,7 @@
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: "{{ ansible_env.HOME }}/undercloud.conf"


roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile.j2 → roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile View File


+ 18
- 4
roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml View File

@ -5,12 +5,18 @@ driver:
log: true
platforms:
- name: centos8
hostname: centos8
image: centos:8
pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
@ -21,6 +27,14 @@ provisioner:
name: ansible
options:
vvv: true
inventory:
hosts:
all:
hosts:
ubi8:
ansible_python_interpreter: /usr/bin/python3
vars:
ansible_user: root
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml


+ 1
- 0
roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml View File

@ -26,6 +26,7 @@
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: "{{ ansible_env.HOME }}/undercloud.conf"


roles/check_undercloud_conf/molecule/required_missing/Dockerfile.j2 → roles/check_undercloud_conf/molecule/required_missing/Dockerfile View File


+ 18
- 4
roles/check_undercloud_conf/molecule/required_missing/molecule.yml View File

@ -5,12 +5,18 @@ driver:
log: true
platforms:
- name: centos8
hostname: centos8
image: centos:8
pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
- name: ubi8
hostname: ubi8
image: ubi8/ubi-init
registry:
url: registry.access.redhat.com
dockerfile: Dockerfile
pkg_extras: python*-setuptools python*-pyyaml
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
@ -21,6 +27,14 @@ provisioner:
name: ansible
options:
vvv: true
inventory:
hosts:
all:
hosts:
ubi8:
ansible_python_interpreter: /usr/bin/python3
vars:
ansible_user: root
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml


+ 1
- 0
roles/check_undercloud_conf/molecule/required_missing/prepare.yml View File

@ -26,6 +26,7 @@
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: "{{ ansible_env.HOME }}/undercloud.conf"


+ 2
- 0
roles/check_undercloud_conf/tasks/main.yml View File

@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
- name: Ensure we get needed facts
setup:
gather_subset:
@ -21,6 +22,7 @@
- '!any'
- '!min'
- env
# "check_undercloud_conf" tasks
- name: "Retrieve {{ ansible_env.HOME }}/undercloud.conf content"
slurp:


Loading…
Cancel
Save