From 4fc31e06dc71bd321a166d06e54d1bc9106d4874 Mon Sep 17 00:00:00 2001 From: "Gael Chamoulaud (Strider)" Date: Wed, 11 Mar 2020 18:10:25 +0100 Subject: [PATCH] Convert all of the fedora28 container usage to CentOS8 This change moves all of the fedora28 container images to centos8 to ensure we're maximizing coverage in all of our roles with OS images that represent real deployments. While fedora28 was useful to exercise RHEL8 code path's while there was no RHEL/CentOS8 container image, we can now use the upstream CentOS8 image ensuring we're getting a true, representative, environment. The following molecule test has been moved to non-voting as it is facing some issues. A follow up patch will try to fix them ASAP. - check_network_gateway (facing an issue when Ansible is trying to discover the python interpreter used in CentOS8 Docker Image) Change-Id: I02f68b78fdf73a60443d8ea5d2dcb46e5ad67e25 Signed-off-by: Gael Chamoulaud (Strider) --- .../molecule/default/Dockerfile.j2 | 2 +- .../{playbook.yml.j2 => converge.yml.j2} | 0 _skeleton_role_/molecule/default/molecule.yml | 15 +++++++-------- doc/source/_exts/ansible-autodoc.py | 2 +- molecule-requirements.txt | 3 ++- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../{Dockerfile.j2 => Dockerfile} | 2 +- .../{playbook.yml => converge.yml} | 0 .../ceph-ansible-installed/molecule.yml | 19 ++++++++++--------- .../default/{Dockerfile.j2 => Dockerfile} | 2 +- .../default/{playbook.yml => converge.yml} | 0 roles/ceph/molecule/default/molecule.yml | 13 ++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../default/{Dockerfile.j2 => Dockerfile} | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- roles/dns/molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 roles/dns/molecule/default/molecule.yml | 15 +++++++-------- .../default/{Dockerfile.j2 => Dockerfile} | 3 ++- .../default/{playbook.yml => converge.yml} | 0 roles/haproxy/molecule/default/molecule.yml | 19 ++++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../image_serve/molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../node_disks/molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../node_disks/molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../node_health/molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../nova_status/molecule/default/molecule.yml | 17 ++++++++--------- roles/ntp/molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 roles/ntp/molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- roles/repos/molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 roles/repos/molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/docker/Dockerfile.j2 | 2 +- .../docker/{playbook.yml => converge.yml} | 0 .../molecule/docker/molecule.yml | 13 ++++--------- .../molecule/podman/Dockerfile.j2 | 2 +- .../podman/{playbook.yml => converge.yml} | 0 .../molecule/podman/molecule.yml | 17 ++++++++--------- .../molecule/systemd/Dockerfile.j2 | 2 +- .../systemd/{playbook.yml => converge.yml} | 0 .../molecule/systemd/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 17 ++++++++--------- .../non-persistent-token-format/Dockerfile.j2 | 4 ++-- .../{playbook.yml => converge.yml} | 0 .../non-persistent-token-format/molecule.yml | 17 ++++++++--------- .../molecule/default/Dockerfile | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- .../molecule/default/Dockerfile.j2 | 2 +- .../default/{playbook.yml => converge.yml} | 0 .../molecule/default/molecule.yml | 15 +++++++-------- zuul.d/molecule.yaml | 3 ++- 156 files changed, 451 insertions(+), 503 deletions(-) rename _skeleton_role_/molecule/default/{playbook.yml.j2 => converge.yml.j2} (100%) rename roles/advanced_format_512e_support/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ceilometerdb_size/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ceph/molecule/ceph-ansible-installed/{Dockerfile.j2 => Dockerfile} (94%) rename roles/ceph/molecule/ceph-ansible-installed/{playbook.yml => converge.yml} (100%) rename roles/ceph/molecule/default/{Dockerfile.j2 => Dockerfile} (94%) rename roles/ceph/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/check_latest_packages_version/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/check_network_gateway/molecule/default/{Dockerfile.j2 => Dockerfile} (94%) rename roles/check_network_gateway/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/collect_flavors_and_verify_profiles/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/container_status/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/controller_token/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/controller_ulimits/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ctlplane_ip_range/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/dhcp_validations/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/dns/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/haproxy/molecule/default/{Dockerfile.j2 => Dockerfile} (94%) rename roles/haproxy/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/healthcheck_service_status/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/image_serve/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ironic_boot_configuration/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/mysql_open_files_limit/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/network_environment/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/neutron_sanity_check/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/node_disks/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/node_health/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/nova_event_callback/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/nova_status/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ntp/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/openshift_on_openstack/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/openstack_endpoints/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/ovs_dpdk_pmd/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/pacemaker_status/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/rabbitmq_limits/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/repos/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/service_status/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/service_status/molecule/docker/{playbook.yml => converge.yml} (100%) rename roles/service_status/molecule/podman/{playbook.yml => converge.yml} (100%) rename roles/service_status/molecule/systemd/{playbook.yml => converge.yml} (100%) rename roles/stack_health/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/stonith_exists/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/switch_vlans/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/tls_everywhere/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_cpu/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_debug/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_disk_space/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_heat_purge_deleted/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_process_count/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_ram/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_selinux_mode/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_tokenflush/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/undercloud_tokenflush/molecule/non-persistent-token-format/{playbook.yml => converge.yml} (100%) rename roles/validate_selinux/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/xfs_check_ftype/molecule/default/{playbook.yml => converge.yml} (100%) diff --git a/_skeleton_role_/molecule/default/Dockerfile.j2 b/_skeleton_role_/molecule/default/Dockerfile.j2 index 9ae1d2772..235f2220c 100644 --- a/_skeleton_role_/molecule/default/Dockerfile.j2 +++ b/_skeleton_role_/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/_skeleton_role_/molecule/default/playbook.yml.j2 b/_skeleton_role_/molecule/default/converge.yml.j2 similarity index 100% rename from _skeleton_role_/molecule/default/playbook.yml.j2 rename to _skeleton_role_/molecule/default/converge.yml.j2 diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml index 1dbdf8927..106126d92 100644 --- a/_skeleton_role_/molecule/default/molecule.yml +++ b/_skeleton_role_/molecule/default/molecule.yml @@ -10,17 +10,21 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/doc/source/_exts/ansible-autodoc.py b/doc/source/_exts/ansible-autodoc.py index 02c78038e..e85b3cc4a 100644 --- a/doc/source/_exts/ansible-autodoc.py +++ b/doc/source/_exts/ansible-autodoc.py @@ -247,7 +247,7 @@ class AnsibleAutoPluginDirective(Directive): molecule_playbook_path = os.path.join( molecule_path, test, - 'playbook.yml' + 'converge.yml' ) with open(molecule_playbook_path) as f: molecule_playbook = yaml.safe_load(f.read()) diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 57dc64088..907420076 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -6,5 +6,6 @@ pytest pytest-cov pytest-html pytest-xdist -molecule>=2.22rc1,<3 +molecule>=3.0,<3.1 selinux # MIT +jinja2>=2.8.0,<3 diff --git a/roles/advanced_format_512e_support/molecule/default/Dockerfile.j2 b/roles/advanced_format_512e_support/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/advanced_format_512e_support/molecule/default/Dockerfile.j2 +++ b/roles/advanced_format_512e_support/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/advanced_format_512e_support/molecule/default/playbook.yml b/roles/advanced_format_512e_support/molecule/default/converge.yml similarity index 100% rename from roles/advanced_format_512e_support/molecule/default/playbook.yml rename to roles/advanced_format_512e_support/molecule/default/converge.yml diff --git a/roles/advanced_format_512e_support/molecule/default/molecule.yml b/roles/advanced_format_512e_support/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/advanced_format_512e_support/molecule/default/molecule.yml +++ b/roles/advanced_format_512e_support/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ceilometerdb_size/molecule/default/Dockerfile.j2 b/roles/ceilometerdb_size/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ceilometerdb_size/molecule/default/Dockerfile.j2 +++ b/roles/ceilometerdb_size/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ceilometerdb_size/molecule/default/playbook.yml b/roles/ceilometerdb_size/molecule/default/converge.yml similarity index 100% rename from roles/ceilometerdb_size/molecule/default/playbook.yml rename to roles/ceilometerdb_size/molecule/default/converge.yml diff --git a/roles/ceilometerdb_size/molecule/default/molecule.yml b/roles/ceilometerdb_size/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/ceilometerdb_size/molecule/default/molecule.yml +++ b/roles/ceilometerdb_size/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ceph/molecule/ceph-ansible-installed/Dockerfile.j2 b/roles/ceph/molecule/ceph-ansible-installed/Dockerfile similarity index 94% rename from roles/ceph/molecule/ceph-ansible-installed/Dockerfile.j2 rename to roles/ceph/molecule/ceph-ansible-installed/Dockerfile index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ceph/molecule/ceph-ansible-installed/Dockerfile.j2 +++ b/roles/ceph/molecule/ceph-ansible-installed/Dockerfile @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ceph/molecule/ceph-ansible-installed/playbook.yml b/roles/ceph/molecule/ceph-ansible-installed/converge.yml similarity index 100% rename from roles/ceph/molecule/ceph-ansible-installed/playbook.yml rename to roles/ceph/molecule/ceph-ansible-installed/converge.yml diff --git a/roles/ceph/molecule/ceph-ansible-installed/molecule.yml b/roles/ceph/molecule/ceph-ansible-installed/molecule.yml index 01d8b8097..17188060f 100644 --- a/roles/ceph/molecule/ceph-ansible-installed/molecule.yml +++ b/roles/ceph/molecule/ceph-ansible-installed/molecule.yml @@ -8,17 +8,23 @@ platforms: - name: centos7 hostname: centos7 image: centos:7 + dockerfile: Dockerfile pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + dockerfile: Dockerfile + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -39,10 +45,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ceph/molecule/default/Dockerfile.j2 b/roles/ceph/molecule/default/Dockerfile similarity index 94% rename from roles/ceph/molecule/default/Dockerfile.j2 rename to roles/ceph/molecule/default/Dockerfile index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ceph/molecule/default/Dockerfile.j2 +++ b/roles/ceph/molecule/default/Dockerfile @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ceph/molecule/default/playbook.yml b/roles/ceph/molecule/default/converge.yml similarity index 100% rename from roles/ceph/molecule/default/playbook.yml rename to roles/ceph/molecule/default/converge.yml diff --git a/roles/ceph/molecule/default/molecule.yml b/roles/ceph/molecule/default/molecule.yml index f87e17850..2b09d56d4 100644 --- a/roles/ceph/molecule/default/molecule.yml +++ b/roles/ceph/molecule/default/molecule.yml @@ -15,10 +15,10 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML environment: <<: *env @@ -38,10 +38,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/check_latest_packages_version/molecule/default/Dockerfile.j2 b/roles/check_latest_packages_version/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/check_latest_packages_version/molecule/default/Dockerfile.j2 +++ b/roles/check_latest_packages_version/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/check_latest_packages_version/molecule/default/playbook.yml b/roles/check_latest_packages_version/molecule/default/converge.yml similarity index 100% rename from roles/check_latest_packages_version/molecule/default/playbook.yml rename to roles/check_latest_packages_version/molecule/default/converge.yml diff --git a/roles/check_latest_packages_version/molecule/default/molecule.yml b/roles/check_latest_packages_version/molecule/default/molecule.yml index b78ef8d04..fbba6b6f0 100644 --- a/roles/check_latest_packages_version/molecule/default/molecule.yml +++ b/roles/check_latest_packages_version/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/check_network_gateway/molecule/default/Dockerfile.j2 b/roles/check_network_gateway/molecule/default/Dockerfile similarity index 94% rename from roles/check_network_gateway/molecule/default/Dockerfile.j2 rename to roles/check_network_gateway/molecule/default/Dockerfile index 1b91a0e0b..e0534b4d1 100644 --- a/roles/check_network_gateway/molecule/default/Dockerfile.j2 +++ b/roles/check_network_gateway/molecule/default/Dockerfile @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/check_network_gateway/molecule/default/playbook.yml b/roles/check_network_gateway/molecule/default/converge.yml similarity index 100% rename from roles/check_network_gateway/molecule/default/playbook.yml rename to roles/check_network_gateway/molecule/default/converge.yml diff --git a/roles/check_network_gateway/molecule/default/molecule.yml b/roles/check_network_gateway/molecule/default/molecule.yml index ca5a802b4..a79921548 100644 --- a/roles/check_network_gateway/molecule/default/molecule.yml +++ b/roles/check_network_gateway/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr epel-release ruby PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby iputils PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile.j2 b/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile.j2 +++ b/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/collect_flavors_and_verify_profiles/molecule/default/playbook.yml b/roles/collect_flavors_and_verify_profiles/molecule/default/converge.yml similarity index 100% rename from roles/collect_flavors_and_verify_profiles/molecule/default/playbook.yml rename to roles/collect_flavors_and_verify_profiles/molecule/default/converge.yml diff --git a/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml b/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml +++ b/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/container_status/molecule/default/Dockerfile.j2 b/roles/container_status/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/container_status/molecule/default/Dockerfile.j2 +++ b/roles/container_status/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/container_status/molecule/default/playbook.yml b/roles/container_status/molecule/default/converge.yml similarity index 100% rename from roles/container_status/molecule/default/playbook.yml rename to roles/container_status/molecule/default/converge.yml diff --git a/roles/container_status/molecule/default/molecule.yml b/roles/container_status/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/container_status/molecule/default/molecule.yml +++ b/roles/container_status/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/controller_token/molecule/default/Dockerfile.j2 b/roles/controller_token/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/controller_token/molecule/default/Dockerfile.j2 +++ b/roles/controller_token/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/controller_token/molecule/default/playbook.yml b/roles/controller_token/molecule/default/converge.yml similarity index 100% rename from roles/controller_token/molecule/default/playbook.yml rename to roles/controller_token/molecule/default/converge.yml diff --git a/roles/controller_token/molecule/default/molecule.yml b/roles/controller_token/molecule/default/molecule.yml index 5966f5ac7..42c399779 100644 --- a/roles/controller_token/molecule/default/molecule.yml +++ b/roles/controller_token/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/controller_ulimits/molecule/default/Dockerfile.j2 b/roles/controller_ulimits/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/controller_ulimits/molecule/default/Dockerfile.j2 +++ b/roles/controller_ulimits/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/controller_ulimits/molecule/default/playbook.yml b/roles/controller_ulimits/molecule/default/converge.yml similarity index 100% rename from roles/controller_ulimits/molecule/default/playbook.yml rename to roles/controller_ulimits/molecule/default/converge.yml diff --git a/roles/controller_ulimits/molecule/default/molecule.yml b/roles/controller_ulimits/molecule/default/molecule.yml index 0b3a96dfd..0320d5a92 100644 --- a/roles/controller_ulimits/molecule/default/molecule.yml +++ b/roles/controller_ulimits/molecule/default/molecule.yml @@ -11,17 +11,21 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 + - name: centos8 ulimits: *ulimits - hostname: fedora28 - image: fedora:28 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 b/roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 +++ b/roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ctlplane_ip_range/molecule/default/playbook.yml b/roles/ctlplane_ip_range/molecule/default/converge.yml similarity index 100% rename from roles/ctlplane_ip_range/molecule/default/playbook.yml rename to roles/ctlplane_ip_range/molecule/default/converge.yml diff --git a/roles/ctlplane_ip_range/molecule/default/molecule.yml b/roles/ctlplane_ip_range/molecule/default/molecule.yml index f87e17850..ca4d02b91 100644 --- a/roles/ctlplane_ip_range/molecule/default/molecule.yml +++ b/roles/ctlplane_ip_range/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/dhcp_validations/molecule/default/Dockerfile.j2 b/roles/dhcp_validations/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/dhcp_validations/molecule/default/Dockerfile.j2 +++ b/roles/dhcp_validations/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/dhcp_validations/molecule/default/playbook.yml b/roles/dhcp_validations/molecule/default/converge.yml similarity index 100% rename from roles/dhcp_validations/molecule/default/playbook.yml rename to roles/dhcp_validations/molecule/default/converge.yml diff --git a/roles/dhcp_validations/molecule/default/molecule.yml b/roles/dhcp_validations/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/dhcp_validations/molecule/default/molecule.yml +++ b/roles/dhcp_validations/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/dns/molecule/default/Dockerfile.j2 b/roles/dns/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/dns/molecule/default/Dockerfile.j2 +++ b/roles/dns/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/dns/molecule/default/playbook.yml b/roles/dns/molecule/default/converge.yml similarity index 100% rename from roles/dns/molecule/default/playbook.yml rename to roles/dns/molecule/default/converge.yml diff --git a/roles/dns/molecule/default/molecule.yml b/roles/dns/molecule/default/molecule.yml index 5eb59c254..1ec8a62d7 100644 --- a/roles/dns/molecule/default/molecule.yml +++ b/roles/dns/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/haproxy/molecule/default/Dockerfile.j2 b/roles/haproxy/molecule/default/Dockerfile similarity index 94% rename from roles/haproxy/molecule/default/Dockerfile.j2 rename to roles/haproxy/molecule/default/Dockerfile index a2e66f422..e0534b4d1 100644 --- a/roles/haproxy/molecule/default/Dockerfile.j2 +++ b/roles/haproxy/molecule/default/Dockerfile @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ @@ -33,4 +33,5 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth RUN easy_install {{ pkg }} {% endfor %} + CMD ["sh", "-c", "while true; do sleep 10000; done"] diff --git a/roles/haproxy/molecule/default/playbook.yml b/roles/haproxy/molecule/default/converge.yml similarity index 100% rename from roles/haproxy/molecule/default/playbook.yml rename to roles/haproxy/molecule/default/converge.yml diff --git a/roles/haproxy/molecule/default/molecule.yml b/roles/haproxy/molecule/default/molecule.yml index 9fa3f4cd1..97741ee39 100644 --- a/roles/haproxy/molecule/default/molecule.yml +++ b/roles/haproxy/molecule/default/molecule.yml @@ -8,17 +8,23 @@ platforms: - name: centos7 hostname: centos7 image: centos:7 + dockerfile: Dockerfile pkg_extras: python-setuptools haproxy PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools haproxy PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + dockerfile: Dockerfile + pkg_extras: python*-setuptools haproxy python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: true - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/healthcheck_service_status/molecule/default/Dockerfile.j2 b/roles/healthcheck_service_status/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/healthcheck_service_status/molecule/default/Dockerfile.j2 +++ b/roles/healthcheck_service_status/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/healthcheck_service_status/molecule/default/playbook.yml b/roles/healthcheck_service_status/molecule/default/converge.yml similarity index 100% rename from roles/healthcheck_service_status/molecule/default/playbook.yml rename to roles/healthcheck_service_status/molecule/default/converge.yml diff --git a/roles/healthcheck_service_status/molecule/default/molecule.yml b/roles/healthcheck_service_status/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/healthcheck_service_status/molecule/default/molecule.yml +++ b/roles/healthcheck_service_status/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/image_serve/molecule/default/Dockerfile.j2 b/roles/image_serve/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/image_serve/molecule/default/Dockerfile.j2 +++ b/roles/image_serve/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/image_serve/molecule/default/playbook.yml b/roles/image_serve/molecule/default/converge.yml similarity index 100% rename from roles/image_serve/molecule/default/playbook.yml rename to roles/image_serve/molecule/default/converge.yml diff --git a/roles/image_serve/molecule/default/molecule.yml b/roles/image_serve/molecule/default/molecule.yml index 82496abe9..6138aefd9 100644 --- a/roles/image_serve/molecule/default/molecule.yml +++ b/roles/image_serve/molecule/default/molecule.yml @@ -11,18 +11,22 @@ platforms: override_command: true command: python -m SimpleHTTPServer 8787 pkg_extras: python-setuptools python-enum34 python-netaddr epel-release ruby PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 override_command: true command: python3 -m http.server 8787 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -42,10 +46,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ironic_boot_configuration/molecule/default/Dockerfile.j2 b/roles/ironic_boot_configuration/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ironic_boot_configuration/molecule/default/Dockerfile.j2 +++ b/roles/ironic_boot_configuration/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ironic_boot_configuration/molecule/default/playbook.yml b/roles/ironic_boot_configuration/molecule/default/converge.yml similarity index 100% rename from roles/ironic_boot_configuration/molecule/default/playbook.yml rename to roles/ironic_boot_configuration/molecule/default/converge.yml diff --git a/roles/ironic_boot_configuration/molecule/default/molecule.yml b/roles/ironic_boot_configuration/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/ironic_boot_configuration/molecule/default/molecule.yml +++ b/roles/ironic_boot_configuration/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/mysql_open_files_limit/molecule/default/Dockerfile.j2 b/roles/mysql_open_files_limit/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/mysql_open_files_limit/molecule/default/Dockerfile.j2 +++ b/roles/mysql_open_files_limit/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/mysql_open_files_limit/molecule/default/playbook.yml b/roles/mysql_open_files_limit/molecule/default/converge.yml similarity index 100% rename from roles/mysql_open_files_limit/molecule/default/playbook.yml rename to roles/mysql_open_files_limit/molecule/default/converge.yml diff --git a/roles/mysql_open_files_limit/molecule/default/molecule.yml b/roles/mysql_open_files_limit/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/mysql_open_files_limit/molecule/default/molecule.yml +++ b/roles/mysql_open_files_limit/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/network_environment/molecule/default/Dockerfile.j2 b/roles/network_environment/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/network_environment/molecule/default/Dockerfile.j2 +++ b/roles/network_environment/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/network_environment/molecule/default/playbook.yml b/roles/network_environment/molecule/default/converge.yml similarity index 100% rename from roles/network_environment/molecule/default/playbook.yml rename to roles/network_environment/molecule/default/converge.yml diff --git a/roles/network_environment/molecule/default/molecule.yml b/roles/network_environment/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/network_environment/molecule/default/molecule.yml +++ b/roles/network_environment/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/neutron_sanity_check/molecule/default/Dockerfile.j2 b/roles/neutron_sanity_check/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/neutron_sanity_check/molecule/default/Dockerfile.j2 +++ b/roles/neutron_sanity_check/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/neutron_sanity_check/molecule/default/playbook.yml b/roles/neutron_sanity_check/molecule/default/converge.yml similarity index 100% rename from roles/neutron_sanity_check/molecule/default/playbook.yml rename to roles/neutron_sanity_check/molecule/default/converge.yml diff --git a/roles/neutron_sanity_check/molecule/default/molecule.yml b/roles/neutron_sanity_check/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/neutron_sanity_check/molecule/default/molecule.yml +++ b/roles/neutron_sanity_check/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/node_disks/molecule/default/Dockerfile.j2 b/roles/node_disks/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/node_disks/molecule/default/Dockerfile.j2 +++ b/roles/node_disks/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/node_disks/molecule/default/playbook.yml b/roles/node_disks/molecule/default/converge.yml similarity index 100% rename from roles/node_disks/molecule/default/playbook.yml rename to roles/node_disks/molecule/default/converge.yml diff --git a/roles/node_disks/molecule/default/molecule.yml b/roles/node_disks/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/node_disks/molecule/default/molecule.yml +++ b/roles/node_disks/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/node_health/molecule/default/Dockerfile.j2 b/roles/node_health/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/node_health/molecule/default/Dockerfile.j2 +++ b/roles/node_health/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/node_health/molecule/default/playbook.yml b/roles/node_health/molecule/default/converge.yml similarity index 100% rename from roles/node_health/molecule/default/playbook.yml rename to roles/node_health/molecule/default/converge.yml diff --git a/roles/node_health/molecule/default/molecule.yml b/roles/node_health/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/node_health/molecule/default/molecule.yml +++ b/roles/node_health/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/nova_event_callback/molecule/default/Dockerfile.j2 b/roles/nova_event_callback/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/nova_event_callback/molecule/default/Dockerfile.j2 +++ b/roles/nova_event_callback/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/nova_event_callback/molecule/default/playbook.yml b/roles/nova_event_callback/molecule/default/converge.yml similarity index 100% rename from roles/nova_event_callback/molecule/default/playbook.yml rename to roles/nova_event_callback/molecule/default/converge.yml diff --git a/roles/nova_event_callback/molecule/default/molecule.yml b/roles/nova_event_callback/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/nova_event_callback/molecule/default/molecule.yml +++ b/roles/nova_event_callback/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/nova_status/molecule/default/Dockerfile.j2 b/roles/nova_status/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/nova_status/molecule/default/Dockerfile.j2 +++ b/roles/nova_status/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/nova_status/molecule/default/playbook.yml b/roles/nova_status/molecule/default/converge.yml similarity index 100% rename from roles/nova_status/molecule/default/playbook.yml rename to roles/nova_status/molecule/default/converge.yml diff --git a/roles/nova_status/molecule/default/molecule.yml b/roles/nova_status/molecule/default/molecule.yml index 5966f5ac7..42c399779 100644 --- a/roles/nova_status/molecule/default/molecule.yml +++ b/roles/nova_status/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ntp/molecule/default/Dockerfile.j2 b/roles/ntp/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ntp/molecule/default/Dockerfile.j2 +++ b/roles/ntp/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ntp/molecule/default/playbook.yml b/roles/ntp/molecule/default/converge.yml similarity index 100% rename from roles/ntp/molecule/default/playbook.yml rename to roles/ntp/molecule/default/converge.yml diff --git a/roles/ntp/molecule/default/molecule.yml b/roles/ntp/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/ntp/molecule/default/molecule.yml +++ b/roles/ntp/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/openshift_on_openstack/molecule/default/Dockerfile.j2 b/roles/openshift_on_openstack/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/openshift_on_openstack/molecule/default/Dockerfile.j2 +++ b/roles/openshift_on_openstack/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/openshift_on_openstack/molecule/default/playbook.yml b/roles/openshift_on_openstack/molecule/default/converge.yml similarity index 100% rename from roles/openshift_on_openstack/molecule/default/playbook.yml rename to roles/openshift_on_openstack/molecule/default/converge.yml diff --git a/roles/openshift_on_openstack/molecule/default/molecule.yml b/roles/openshift_on_openstack/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/openshift_on_openstack/molecule/default/molecule.yml +++ b/roles/openshift_on_openstack/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/openstack_endpoints/molecule/default/Dockerfile.j2 b/roles/openstack_endpoints/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/openstack_endpoints/molecule/default/Dockerfile.j2 +++ b/roles/openstack_endpoints/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/openstack_endpoints/molecule/default/playbook.yml b/roles/openstack_endpoints/molecule/default/converge.yml similarity index 100% rename from roles/openstack_endpoints/molecule/default/playbook.yml rename to roles/openstack_endpoints/molecule/default/converge.yml diff --git a/roles/openstack_endpoints/molecule/default/molecule.yml b/roles/openstack_endpoints/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/openstack_endpoints/molecule/default/molecule.yml +++ b/roles/openstack_endpoints/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/ovs_dpdk_pmd/molecule/default/Dockerfile.j2 b/roles/ovs_dpdk_pmd/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ovs_dpdk_pmd/molecule/default/Dockerfile.j2 +++ b/roles/ovs_dpdk_pmd/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/ovs_dpdk_pmd/molecule/default/playbook.yml b/roles/ovs_dpdk_pmd/molecule/default/converge.yml similarity index 100% rename from roles/ovs_dpdk_pmd/molecule/default/playbook.yml rename to roles/ovs_dpdk_pmd/molecule/default/converge.yml diff --git a/roles/ovs_dpdk_pmd/molecule/default/molecule.yml b/roles/ovs_dpdk_pmd/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/ovs_dpdk_pmd/molecule/default/molecule.yml +++ b/roles/ovs_dpdk_pmd/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/pacemaker_status/molecule/default/Dockerfile.j2 b/roles/pacemaker_status/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/pacemaker_status/molecule/default/Dockerfile.j2 +++ b/roles/pacemaker_status/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/pacemaker_status/molecule/default/playbook.yml b/roles/pacemaker_status/molecule/default/converge.yml similarity index 100% rename from roles/pacemaker_status/molecule/default/playbook.yml rename to roles/pacemaker_status/molecule/default/converge.yml diff --git a/roles/pacemaker_status/molecule/default/molecule.yml b/roles/pacemaker_status/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/pacemaker_status/molecule/default/molecule.yml +++ b/roles/pacemaker_status/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/rabbitmq_limits/molecule/default/Dockerfile.j2 b/roles/rabbitmq_limits/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/rabbitmq_limits/molecule/default/Dockerfile.j2 +++ b/roles/rabbitmq_limits/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/rabbitmq_limits/molecule/default/playbook.yml b/roles/rabbitmq_limits/molecule/default/converge.yml similarity index 100% rename from roles/rabbitmq_limits/molecule/default/playbook.yml rename to roles/rabbitmq_limits/molecule/default/converge.yml diff --git a/roles/rabbitmq_limits/molecule/default/molecule.yml b/roles/rabbitmq_limits/molecule/default/molecule.yml index 7067900c6..3e6603cb8 100644 --- a/roles/rabbitmq_limits/molecule/default/molecule.yml +++ b/roles/rabbitmq_limits/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/repos/molecule/default/Dockerfile.j2 b/roles/repos/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/repos/molecule/default/Dockerfile.j2 +++ b/roles/repos/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/repos/molecule/default/playbook.yml b/roles/repos/molecule/default/converge.yml similarity index 100% rename from roles/repos/molecule/default/playbook.yml rename to roles/repos/molecule/default/converge.yml diff --git a/roles/repos/molecule/default/molecule.yml b/roles/repos/molecule/default/molecule.yml index 5eb59c254..0ce6f867a 100644 --- a/roles/repos/molecule/default/molecule.yml +++ b/roles/repos/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/service_status/molecule/default/Dockerfile.j2 b/roles/service_status/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/service_status/molecule/default/Dockerfile.j2 +++ b/roles/service_status/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/service_status/molecule/default/playbook.yml b/roles/service_status/molecule/default/converge.yml similarity index 100% rename from roles/service_status/molecule/default/playbook.yml rename to roles/service_status/molecule/default/converge.yml diff --git a/roles/service_status/molecule/default/molecule.yml b/roles/service_status/molecule/default/molecule.yml index b8430d5a2..929fbafc4 100644 --- a/roles/service_status/molecule/default/molecule.yml +++ b/roles/service_status/molecule/default/molecule.yml @@ -9,6 +9,8 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip command: /sbin/init @@ -16,11 +18,13 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 command: /sbin/init - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/service_status/molecule/docker/Dockerfile.j2 b/roles/service_status/molecule/docker/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/service_status/molecule/docker/Dockerfile.j2 +++ b/roles/service_status/molecule/docker/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/service_status/molecule/docker/playbook.yml b/roles/service_status/molecule/docker/converge.yml similarity index 100% rename from roles/service_status/molecule/docker/playbook.yml rename to roles/service_status/molecule/docker/converge.yml diff --git a/roles/service_status/molecule/docker/molecule.yml b/roles/service_status/molecule/docker/molecule.yml index c4b5b912c..71210c0b2 100644 --- a/roles/service_status/molecule/docker/molecule.yml +++ b/roles/service_status/molecule/docker/molecule.yml @@ -22,9 +22,9 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 command: /sbin/init capabilities: - SYS_ADMIN @@ -32,7 +32,7 @@ platforms: volumes: - /var/run/docker.sock:/var/run/docker.sock - /sys/fs/cgroup:/sys/fs/cgroup:ro - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML python*-libselinux + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML python*-libselinux environment: <<: *env @@ -52,10 +52,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/service_status/molecule/podman/Dockerfile.j2 b/roles/service_status/molecule/podman/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/service_status/molecule/podman/Dockerfile.j2 +++ b/roles/service_status/molecule/podman/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/service_status/molecule/podman/playbook.yml b/roles/service_status/molecule/podman/converge.yml similarity index 100% rename from roles/service_status/molecule/podman/playbook.yml rename to roles/service_status/molecule/podman/converge.yml diff --git a/roles/service_status/molecule/podman/molecule.yml b/roles/service_status/molecule/podman/molecule.yml index b8430d5a2..929fbafc4 100644 --- a/roles/service_status/molecule/podman/molecule.yml +++ b/roles/service_status/molecule/podman/molecule.yml @@ -9,6 +9,8 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip command: /sbin/init @@ -16,11 +18,13 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 command: /sbin/init - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/service_status/molecule/systemd/Dockerfile.j2 b/roles/service_status/molecule/systemd/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/service_status/molecule/systemd/Dockerfile.j2 +++ b/roles/service_status/molecule/systemd/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/service_status/molecule/systemd/playbook.yml b/roles/service_status/molecule/systemd/converge.yml similarity index 100% rename from roles/service_status/molecule/systemd/playbook.yml rename to roles/service_status/molecule/systemd/converge.yml diff --git a/roles/service_status/molecule/systemd/molecule.yml b/roles/service_status/molecule/systemd/molecule.yml index b8430d5a2..929fbafc4 100644 --- a/roles/service_status/molecule/systemd/molecule.yml +++ b/roles/service_status/molecule/systemd/molecule.yml @@ -9,6 +9,8 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip command: /sbin/init @@ -16,11 +18,13 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 command: /sbin/init - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/stack_health/molecule/default/Dockerfile.j2 b/roles/stack_health/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/stack_health/molecule/default/Dockerfile.j2 +++ b/roles/stack_health/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/stack_health/molecule/default/playbook.yml b/roles/stack_health/molecule/default/converge.yml similarity index 100% rename from roles/stack_health/molecule/default/playbook.yml rename to roles/stack_health/molecule/default/converge.yml diff --git a/roles/stack_health/molecule/default/molecule.yml b/roles/stack_health/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/stack_health/molecule/default/molecule.yml +++ b/roles/stack_health/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/stonith_exists/molecule/default/Dockerfile.j2 b/roles/stonith_exists/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/stonith_exists/molecule/default/Dockerfile.j2 +++ b/roles/stonith_exists/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/stonith_exists/molecule/default/playbook.yml b/roles/stonith_exists/molecule/default/converge.yml similarity index 100% rename from roles/stonith_exists/molecule/default/playbook.yml rename to roles/stonith_exists/molecule/default/converge.yml diff --git a/roles/stonith_exists/molecule/default/molecule.yml b/roles/stonith_exists/molecule/default/molecule.yml index 5eb59c254..0ce6f867a 100644 --- a/roles/stonith_exists/molecule/default/molecule.yml +++ b/roles/stonith_exists/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/switch_vlans/molecule/default/Dockerfile.j2 b/roles/switch_vlans/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/switch_vlans/molecule/default/Dockerfile.j2 +++ b/roles/switch_vlans/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/switch_vlans/molecule/default/playbook.yml b/roles/switch_vlans/molecule/default/converge.yml similarity index 100% rename from roles/switch_vlans/molecule/default/playbook.yml rename to roles/switch_vlans/molecule/default/converge.yml diff --git a/roles/switch_vlans/molecule/default/molecule.yml b/roles/switch_vlans/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/switch_vlans/molecule/default/molecule.yml +++ b/roles/switch_vlans/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/tls_everywhere/molecule/default/Dockerfile.j2 b/roles/tls_everywhere/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/tls_everywhere/molecule/default/Dockerfile.j2 +++ b/roles/tls_everywhere/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/tls_everywhere/molecule/default/playbook.yml b/roles/tls_everywhere/molecule/default/converge.yml similarity index 100% rename from roles/tls_everywhere/molecule/default/playbook.yml rename to roles/tls_everywhere/molecule/default/converge.yml diff --git a/roles/tls_everywhere/molecule/default/molecule.yml b/roles/tls_everywhere/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/tls_everywhere/molecule/default/molecule.yml +++ b/roles/tls_everywhere/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_cpu/molecule/default/Dockerfile.j2 b/roles/undercloud_cpu/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_cpu/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_cpu/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_cpu/molecule/default/playbook.yml b/roles/undercloud_cpu/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_cpu/molecule/default/playbook.yml rename to roles/undercloud_cpu/molecule/default/converge.yml diff --git a/roles/undercloud_cpu/molecule/default/molecule.yml b/roles/undercloud_cpu/molecule/default/molecule.yml index 5eb59c254..0ce6f867a 100644 --- a/roles/undercloud_cpu/molecule/default/molecule.yml +++ b/roles/undercloud_cpu/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_debug/molecule/default/Dockerfile.j2 b/roles/undercloud_debug/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_debug/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_debug/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_debug/molecule/default/playbook.yml b/roles/undercloud_debug/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_debug/molecule/default/playbook.yml rename to roles/undercloud_debug/molecule/default/converge.yml diff --git a/roles/undercloud_debug/molecule/default/molecule.yml b/roles/undercloud_debug/molecule/default/molecule.yml index 5966f5ac7..42c399779 100644 --- a/roles/undercloud_debug/molecule/default/molecule.yml +++ b/roles/undercloud_debug/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_disk_space/molecule/default/Dockerfile.j2 b/roles/undercloud_disk_space/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_disk_space/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_disk_space/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_disk_space/molecule/default/playbook.yml b/roles/undercloud_disk_space/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_disk_space/molecule/default/playbook.yml rename to roles/undercloud_disk_space/molecule/default/converge.yml diff --git a/roles/undercloud_disk_space/molecule/default/molecule.yml b/roles/undercloud_disk_space/molecule/default/molecule.yml index 5eb59c254..0ce6f867a 100644 --- a/roles/undercloud_disk_space/molecule/default/molecule.yml +++ b/roles/undercloud_disk_space/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 b/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_heat_purge_deleted/molecule/default/playbook.yml b/roles/undercloud_heat_purge_deleted/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_heat_purge_deleted/molecule/default/playbook.yml rename to roles/undercloud_heat_purge_deleted/molecule/default/converge.yml diff --git a/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml b/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml index 82496abe9..6138aefd9 100644 --- a/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml +++ b/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml @@ -11,18 +11,22 @@ platforms: override_command: true command: python -m SimpleHTTPServer 8787 pkg_extras: python-setuptools python-enum34 python-netaddr epel-release ruby PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 override_command: true command: python3 -m http.server 8787 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -42,10 +46,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_process_count/molecule/default/Dockerfile.j2 b/roles/undercloud_process_count/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_process_count/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_process_count/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_process_count/molecule/default/playbook.yml b/roles/undercloud_process_count/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_process_count/molecule/default/playbook.yml rename to roles/undercloud_process_count/molecule/default/converge.yml diff --git a/roles/undercloud_process_count/molecule/default/molecule.yml b/roles/undercloud_process_count/molecule/default/molecule.yml index f87e17850..980916aef 100644 --- a/roles/undercloud_process_count/molecule/default/molecule.yml +++ b/roles/undercloud_process_count/molecule/default/molecule.yml @@ -9,16 +9,20 @@ platforms: hostname: centos7 image: centos:7 pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_ram/molecule/default/Dockerfile.j2 b/roles/undercloud_ram/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_ram/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_ram/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_ram/molecule/default/playbook.yml b/roles/undercloud_ram/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_ram/molecule/default/playbook.yml rename to roles/undercloud_ram/molecule/default/converge.yml diff --git a/roles/undercloud_ram/molecule/default/molecule.yml b/roles/undercloud_ram/molecule/default/molecule.yml index 5eb59c254..1ec8a62d7 100644 --- a/roles/undercloud_ram/molecule/default/molecule.yml +++ b/roles/undercloud_ram/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -37,10 +41,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_selinux_mode/molecule/default/Dockerfile.j2 b/roles/undercloud_selinux_mode/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_selinux_mode/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_selinux_mode/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_selinux_mode/molecule/default/playbook.yml b/roles/undercloud_selinux_mode/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_selinux_mode/molecule/default/playbook.yml rename to roles/undercloud_selinux_mode/molecule/default/converge.yml diff --git a/roles/undercloud_selinux_mode/molecule/default/molecule.yml b/roles/undercloud_selinux_mode/molecule/default/molecule.yml index f87e17850..51f993bf4 100644 --- a/roles/undercloud_selinux_mode/molecule/default/molecule.yml +++ b/roles/undercloud_selinux_mode/molecule/default/molecule.yml @@ -11,14 +11,18 @@ platforms: pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -38,10 +42,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 b/roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 +++ b/roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_tokenflush/molecule/default/playbook.yml b/roles/undercloud_tokenflush/molecule/default/converge.yml similarity index 100% rename from roles/undercloud_tokenflush/molecule/default/playbook.yml rename to roles/undercloud_tokenflush/molecule/default/converge.yml diff --git a/roles/undercloud_tokenflush/molecule/default/molecule.yml b/roles/undercloud_tokenflush/molecule/default/molecule.yml index 82496abe9..6138aefd9 100644 --- a/roles/undercloud_tokenflush/molecule/default/molecule.yml +++ b/roles/undercloud_tokenflush/molecule/default/molecule.yml @@ -11,18 +11,22 @@ platforms: override_command: true command: python -m SimpleHTTPServer 8787 pkg_extras: python-setuptools python-enum34 python-netaddr epel-release ruby PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 override_command: true command: python3 -m http.server 8787 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -42,10 +46,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile.j2 b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile.j2 index 89865258d..e0534b4d1 100644 --- a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile.j2 +++ b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile.j2 @@ -1,5 +1,5 @@ # Molecule managed -# Copyright 2020 Red Hat, Inc. +# Copyright 2019 Red Hat, Inc. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/playbook.yml b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/converge.yml similarity index 100% rename from roles/undercloud_tokenflush/molecule/non-persistent-token-format/playbook.yml rename to roles/undercloud_tokenflush/molecule/non-persistent-token-format/converge.yml diff --git a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml index 82496abe9..6138aefd9 100644 --- a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml +++ b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml @@ -11,18 +11,22 @@ platforms: override_command: true command: python -m SimpleHTTPServer 8787 pkg_extras: python-setuptools python-enum34 python-netaddr epel-release ruby PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 override_command: true command: python3 -m http.server 8787 - pkg_extras: python*-setuptools python*-enum python*-netaddr ruby PyYAML + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -42,10 +46,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/validate_selinux/molecule/default/Dockerfile b/roles/validate_selinux/molecule/default/Dockerfile index 1b91a0e0b..e0534b4d1 100644 --- a/roles/validate_selinux/molecule/default/Dockerfile +++ b/roles/validate_selinux/molecule/default/Dockerfile @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/validate_selinux/molecule/default/playbook.yml b/roles/validate_selinux/molecule/default/converge.yml similarity index 100% rename from roles/validate_selinux/molecule/default/playbook.yml rename to roles/validate_selinux/molecule/default/converge.yml diff --git a/roles/validate_selinux/molecule/default/molecule.yml b/roles/validate_selinux/molecule/default/molecule.yml index 1dbdf8927..bddc2140a 100644 --- a/roles/validate_selinux/molecule/default/molecule.yml +++ b/roles/validate_selinux/molecule/default/molecule.yml @@ -12,15 +12,19 @@ platforms: pkg_extras: python-setuptools easy_install: - pip + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -40,10 +44,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/xfs_check_ftype/molecule/default/Dockerfile.j2 b/roles/xfs_check_ftype/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/xfs_check_ftype/molecule/default/Dockerfile.j2 +++ b/roles/xfs_check_ftype/molecule/default/Dockerfile.j2 @@ -22,7 +22,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ diff --git a/roles/xfs_check_ftype/molecule/default/playbook.yml b/roles/xfs_check_ftype/molecule/default/converge.yml similarity index 100% rename from roles/xfs_check_ftype/molecule/default/playbook.yml rename to roles/xfs_check_ftype/molecule/default/converge.yml diff --git a/roles/xfs_check_ftype/molecule/default/molecule.yml b/roles/xfs_check_ftype/molecule/default/molecule.yml index 13d65f6aa..410f44992 100644 --- a/roles/xfs_check_ftype/molecule/default/molecule.yml +++ b/roles/xfs_check_ftype/molecule/default/molecule.yml @@ -10,17 +10,21 @@ platforms: image: centos:7 privileged: true pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: fedora28 - hostname: fedora28 - image: fedora:28 + - name: centos8 + hostname: centos8 + image: centos:8 privileged: true pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env @@ -39,10 +43,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index f33927a2e..10d8491a6 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -26,7 +26,6 @@ jobs: - tripleo-validations-centos-8-molecule-ceph - tripleo-validations-centos-8-molecule-check_latest_packages_version - - tripleo-validations-centos-8-molecule-check_network_gateway - tripleo-validations-centos-8-molecule-controller_token - tripleo-validations-centos-8-molecule-controller_ulimits - tripleo-validations-centos-8-molecule-ctlplane_ip_range @@ -47,6 +46,7 @@ - tripleo-validations-centos-8-molecule-undercloud_ram - tripleo-validations-centos-8-molecule-undercloud_tokenflush - tripleo-validations-centos-8-molecule-validate_selinux + # - tripleo-validations-centos-8-molecule-check_network_gateway name: tripleo-validations-molecule-jobs - job: files: @@ -339,6 +339,7 @@ parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: check_network_gateway + voting: false - job: files: - ^roles/undercloud_heat_purge_deleted/.*