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 69d6b898b..06f6ca849 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -1,11 +1,14 @@ # this is required for the molecule jobs -ansible ansi2html +ansible docker +# https://github.com/sqlalchemy/dogpile.cache/issues/178 +dogpile.cache>=0.6.5,<0.9.1 # MIT +jinja2>=2.8.0,<3 +mock +molecule>=3.0,<3.1 pytest pytest-cov pytest-html pytest-xdist -mock -molecule>=2.22rc1,<3 selinux # MIT 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/check_network_gateway/molecule/default/Dockerfile.j2 b/roles/ceph/molecule/ceph-ansible-installed/Dockerfile similarity index 94% rename from roles/check_network_gateway/molecule/default/Dockerfile.j2 rename to roles/ceph/molecule/ceph-ansible-installed/Dockerfile index 1b91a0e0b..e0534b4d1 100644 --- a/roles/check_network_gateway/molecule/default/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/haproxy/molecule/default/Dockerfile.j2 b/roles/ceph/molecule/default/Dockerfile similarity index 94% rename from roles/haproxy/molecule/default/Dockerfile.j2 rename to roles/ceph/molecule/default/Dockerfile index a2e66f422..e0534b4d1 100644 --- a/roles/haproxy/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('') }}; \ @@ -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/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 b/roles/check_network_gateway/molecule/default/Dockerfile new file mode 100644 index 000000000..e0534b4d1 --- /dev/null +++ b/roles/check_network_gateway/molecule/default/Dockerfile @@ -0,0 +1,37 @@ +# Molecule managed +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +{% if item.registry is defined %} +FROM {{ item.registry.url }}/{{ item.image }} +{% else %} +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 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('') }}; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi + +{% for pkg in item.easy_install | default([]) %} +# install pip for centos where there is no python-pip rpm in default repos +RUN easy_install {{ pkg }} +{% endfor %} + + +CMD ["sh", "-c", "while true; do sleep 10000; done"] 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 b/roles/haproxy/molecule/default/Dockerfile new file mode 100644 index 000000000..e0534b4d1 --- /dev/null +++ b/roles/haproxy/molecule/default/Dockerfile @@ -0,0 +1,37 @@ +# Molecule managed +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +{% if item.registry is defined %} +FROM {{ item.registry.url }}/{{ item.image }} +{% else %} +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 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('') }}; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi + +{% for pkg in item.easy_install | default([]) %} +# install pip for centos where there is no python-pip rpm in default repos +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/no_op_firewall_nova_driver/molecule/default/Dockerfile.j2 b/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile.j2 +++ b/roles/no_op_firewall_nova_driver/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/no_op_firewall_nova_driver/molecule/default/playbook.yml b/roles/no_op_firewall_nova_driver/molecule/default/converge.yml similarity index 100% rename from roles/no_op_firewall_nova_driver/molecule/default/playbook.yml rename to roles/no_op_firewall_nova_driver/molecule/default/converge.yml diff --git a/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml b/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml index 5966f5ac7..6421c4dfd 100644 --- a/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml +++ b/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml @@ -8,17 +8,22 @@ platforms: - name: centos7 hostname: centos7 image: centos:7 - pkg_extras: python-setuptools python-enum34 PyYAML + 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 PyYAML + - name: centos8 + hostname: centos8 + image: centos:8 + command: /sbin/init + 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 +43,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 f87e17850..6421c4dfd 100644 --- a/roles/service_status/molecule/default/molecule.yml +++ b/roles/service_status/molecule/default/molecule.yml @@ -9,16 +9,21 @@ 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 + command: /sbin/init + 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 +43,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/service_status/molecule/docker/converge.yml b/roles/service_status/molecule/docker/converge.yml new file mode 100644 index 000000000..b3db61a7f --- /dev/null +++ b/roles/service_status/molecule/docker/converge.yml @@ -0,0 +1,59 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +- name: Converge + hosts: all + gather_facts: false + become: true + + tasks: + - name: "Check containers - docker version, no service" + include_role: + name: service_status + tasks_from: containers.yaml + + - name: "Check containers - docker version, with service" + block: + - name: Activate docker service + service: + name: docker + state: started + enabled: true + + - name: Catch failure + block: + - name: Run check + include_role: + name: service_status + tasks_from: containers.yaml + + rescue: + - name: Clear host errors + meta: clear_host_errors + + - name: Test output + debug: + msg: | + Success finding broken containers + + - name: End play + meta: end_play + + - name: Fail if this point is reached + fail: + msg: | + Did not find broken containers diff --git a/roles/service_status/molecule/docker/molecule.yml b/roles/service_status/molecule/docker/molecule.yml new file mode 100644 index 000000000..71210c0b2 --- /dev/null +++ b/roles/service_status/molecule/docker/molecule.yml @@ -0,0 +1,56 @@ +--- +driver: + name: docker + +log: true + +platforms: + - name: centos7 + hostname: centos7 + image: centos:7 + pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + easy_install: + - pip + command: /sbin/init + capabilities: + - SYS_ADMIN + privileged: true + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /sys/fs/cgroup:/sys/fs/cgroup:ro + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + + - name: centos8 + hostname: centos8 + image: centos:8 + command: /sbin/init + capabilities: + - SYS_ADMIN + privileged: true + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /sys/fs/cgroup:/sys/fs/cgroup:ro + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML python*-libselinux + environment: + <<: *env + +provisioner: + name: ansible + log: true + env: + ANSIBLE_STDOUT_CALLBACK: yaml + ANSIBLE_LIBRARY: "../../../../library" + +scenario: + test_sequence: + - destroy + - create + - prepare + - converge + - verify + - destroy + +verifier: + name: testinfra diff --git a/roles/ceph/molecule/ceph-ansible-installed/Dockerfile.j2 b/roles/service_status/molecule/podman/Dockerfile.j2 similarity index 94% rename from roles/ceph/molecule/ceph-ansible-installed/Dockerfile.j2 rename to roles/service_status/molecule/podman/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ceph/molecule/ceph-ansible-installed/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/converge.yml b/roles/service_status/molecule/podman/converge.yml new file mode 100644 index 000000000..9bef3a2d4 --- /dev/null +++ b/roles/service_status/molecule/podman/converge.yml @@ -0,0 +1,46 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +- name: Converge + hosts: all + gather_facts: false + vars: + service_status_podman_opt: '--storage-driver=vfs' + + tasks: + - name: Check podman container state + block: + - name: Detect failed podman containers + include_role: + name: service_status + tasks_from: containers.yaml + rescue: + - name: Clear host errors + meta: clear_host_errors + + - name: Test output + debug: + msg: | + Properly detected failed container + + - name: End play now + meta: end_play + + - name: Fail if we get to this point + fail: + msg: | + Did not detect failed container diff --git a/roles/service_status/molecule/podman/molecule.yml b/roles/service_status/molecule/podman/molecule.yml new file mode 100644 index 000000000..929fbafc4 --- /dev/null +++ b/roles/service_status/molecule/podman/molecule.yml @@ -0,0 +1,48 @@ +--- +driver: + name: docker + +log: true + +platforms: + - name: centos7 + 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 + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + + - name: centos8 + hostname: centos8 + image: centos:8 + command: /sbin/init + 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 + +provisioner: + name: ansible + log: true + env: + ANSIBLE_STDOUT_CALLBACK: yaml + ANSIBLE_LIBRARY: "../../../../library" + +scenario: + test_sequence: + - destroy + - create + - prepare + - converge + - verify + - destroy + +verifier: + name: testinfra diff --git a/roles/ceph/molecule/default/Dockerfile.j2 b/roles/service_status/molecule/systemd/Dockerfile.j2 similarity index 94% rename from roles/ceph/molecule/default/Dockerfile.j2 rename to roles/service_status/molecule/systemd/Dockerfile.j2 index 1b91a0e0b..e0534b4d1 100644 --- a/roles/ceph/molecule/default/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/converge.yml b/roles/service_status/molecule/systemd/converge.yml new file mode 100644 index 000000000..0f2cd0bdd --- /dev/null +++ b/roles/service_status/molecule/systemd/converge.yml @@ -0,0 +1,44 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +- name: Converge + hosts: all + gather_facts: false + + tasks: + - name: Check service + block: + - name: Run validation + include_role: + name: service_status + tasks_from: systemd.yaml + rescue: + - name: Clear errors + meta: clear_host_errors + + - name: Test output + debug: + msg: | + Successfully detected failed unit + + - name: End play + meta: end_play + + - name: Fail if this point is reached + fail: + msg: | + Did not detect failed unit diff --git a/roles/service_status/molecule/systemd/molecule.yml b/roles/service_status/molecule/systemd/molecule.yml new file mode 100644 index 000000000..929fbafc4 --- /dev/null +++ b/roles/service_status/molecule/systemd/molecule.yml @@ -0,0 +1,48 @@ +--- +driver: + name: docker + +log: true + +platforms: + - name: centos7 + 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 + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + + - name: centos8 + hostname: centos8 + image: centos:8 + command: /sbin/init + 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 + +provisioner: + name: ansible + log: true + env: + ANSIBLE_STDOUT_CALLBACK: yaml + ANSIBLE_LIBRARY: "../../../../library" + +scenario: + test_sequence: + - destroy + - create + - prepare + - converge + - verify + - destroy + +verifier: + name: testinfra 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 eca30f6fd..4659b29f9 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: @@ -346,6 +346,7 @@ parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: check_network_gateway + voting: false - job: files: - ^roles/undercloud_heat_purge_deleted/.*