From e7c4445b15796c1d60d11f2b4286908b2dd50a91 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Fri, 29 Apr 2022 10:25:40 +0530 Subject: [PATCH] Use default config_podman.yml config for podman driver By following the footprint of https://review.opendev.org/c/openstack/tripleo-ansible/+/839685 to use default config for delegated driver. It adds the default podman config and reuse the same in all roles where CentOS8 image is used for testing. Note: It is not a clean cherry-pick. It fixes ceph molecule jobs. Signed-off-by: Chandan Kumar (raukadah) Change-Id: I3e6dba0539b9622433ce74e18b5fbdc05e5bcaaf (cherry picked from commit d95784efa53cc4badf650061da7045b4b34f5229) --- .../molecule/Dockerfile.j2 | 0 .config/molecule/config_podman.yml | 34 +++++++++++++++++ tests/test_molecule.py | 19 +++++++++- .../molecule/tripleo_dnf_stream/molecule.yml | 24 +----------- .../roles/aide/molecule/default/Dockerfile | 37 ------------------- .../roles/aide/molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 21 ----------- .../login_defs/molecule/default/Dockerfile | 37 ------------------- .../login_defs/molecule/default/molecule.yml | 22 ----------- .../test_deps/molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/negative/Dockerfile | 37 ------------------- .../molecule/negative/molecule.yml | 25 +------------ .../molecule/positive/Dockerfile | 37 ------------------- .../molecule/positive/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 36 ------------------ .../molecule/default/molecule.yml | 21 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 36 ------------------ .../molecule/default/molecule.yml | 21 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 21 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/prepare.yml | 2 +- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/addkey/Dockerfile | 37 ------------------- .../molecule/addkey/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/keygen/Dockerfile | 37 ------------------- .../molecule/keygen/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/ansible_hieradata/Dockerfile | 37 ------------------- .../molecule/ansible_hieradata/molecule.yml | 26 +------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/hieradata_vars/Dockerfile | 37 ------------------- .../molecule/hieradata_vars/molecule.yml | 26 +------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 36 ------------------ .../molecule/default/molecule.yml | 23 ------------ .../molecule/legacy_vars/Dockerfile | 36 ------------------ .../molecule/legacy_vars/molecule.yml | 25 +------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/legacy_vars/Dockerfile | 37 ------------------- .../molecule/remove_module/Dockerfile | 37 ------------------- .../molecule/custom_config/Dockerfile | 37 ------------------- .../molecule/custom_config/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/prepare.yml | 3 ++ .../molecule/preexisting_config/Dockerfile | 37 ------------------- .../molecule/preexisting_config/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/prepare.yml | 2 + .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 +----------- .../molecule/default/prepare.yml | 2 +- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 21 ----------- .../molecule/default/Dockerfile | 34 ----------------- .../molecule/default/molecule.yml | 28 +++----------- .../molecule/positive/Dockerfile | 34 ----------------- .../molecule/positive/molecule.yml | 28 +++----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../tripleo_ptp/molecule/default/Dockerfile | 37 ------------------- .../tripleo_ptp/molecule/default/molecule.yml | 23 ------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 22 ----------- .../molecule/default/Dockerfile | 36 ------------------ .../molecule/default/molecule.yml | 21 ----------- .../molecule/create/Dockerfile | 37 ------------------- .../molecule/create/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 20 ---------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 32 +++------------- .../molecule/default/tests/test_default.py | 2 +- .../molecule/no_networks/Dockerfile | 37 ------------------- .../molecule/no_networks/molecule.yml | 26 +------------ .../no_networks/tests/test_no_networks.py | 2 +- .../tripleo_sshd/molecule/banners/Dockerfile | 37 ------------------- .../molecule/banners/molecule.yml | 25 +------------ .../tripleo_sshd/molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 23 ------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 ------------ .../molecule/defaults/Dockerfile | 37 ------------------- .../molecule/defaults/molecule.yml | 24 +----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 24 ------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 21 ----------- .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 23 ------------ .../molecule/default/Dockerfile | 37 ------------------- .../molecule/default/molecule.yml | 23 ------------ 125 files changed, 101 insertions(+), 3462 deletions(-) rename tripleo_ansible/roles/test_deps/molecule/default/Dockerfile => .config/molecule/Dockerfile.j2 (100%) create mode 100644 .config/molecule/config_podman.yml delete mode 100644 tripleo_ansible/roles/aide/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/designate_bind_config/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/login_defs/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile delete mode 100644 tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_client/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_cephadm/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_container_image_build/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_multipathd/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_network_config/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_nvdimm/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_unbound/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/test_deps/molecule/default/Dockerfile b/.config/molecule/Dockerfile.j2 similarity index 100% rename from tripleo_ansible/roles/test_deps/molecule/default/Dockerfile rename to .config/molecule/Dockerfile.j2 diff --git a/.config/molecule/config_podman.yml b/.config/molecule/config_podman.yml new file mode 100644 index 000000000..4fe6d8722 --- /dev/null +++ b/.config/molecule/config_podman.yml @@ -0,0 +1,34 @@ +--- +log: true +platforms: + - name: centos + hostname: centos + image: centos/centos:stream8 + registry: + url: quay.io + dockerfile: Dockerfile.j2 + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + - /etc/dnf/vars:/etc/dnf/vars + privileged: true + command: /sbin/init + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + ulimits: &ulimit + - host + +provisioner: + inventory: + hosts: + all: + hosts: + centos: + ansible_python_interpreter: /usr/bin/python3 + name: ansible + log: true + env: + ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tests/test_molecule.py b/tests/test_molecule.py index dc26792ad..6414b3785 100644 --- a/tests/test_molecule.py +++ b/tests/test_molecule.py @@ -11,16 +11,32 @@ # See the License for the specific language governing permissions and # limitations under the License. - +import os import subprocess import pytest +import yaml + + +def set_proper_molecule_config(role_path): + mol_config_file = "config.yml" + if os.path.exists(os.path.join(role_path, 'molecule', 'default/molecule.yml')): + molecule_path = os.path.join(role_path, 'molecule', 'default/molecule.yml') + with open(molecule_path) as content: + data = yaml.safe_load(content) + if 'driver' in data.keys() and data['driver']['name'] == 'podman': + mol_config_file = "config_podman.yml" + + root_path = os.path.dirname(os.path.abspath(__file__)).split('/tests')[0] + mol_config = os.path.join(root_path, '.config/molecule', mol_config_file) + return mol_config def test_molecule(pytestconfig): cmd = ['python', '-m', 'molecule'] scenario = pytestconfig.getoption("scenario") ansible_args = pytestconfig.getoption("ansible_args") + cmd.extend(['--base-config', set_proper_molecule_config(os.getcwd())]) if ansible_args: cmd.append('converge') @@ -40,6 +56,7 @@ def test_molecule(pytestconfig): finally: if ansible_args: cmd = ['python', '-m', 'molecule', 'destroy'] + cmd.extend(['--base-config', set_proper_molecule_config(os.getcwd())]) if scenario: cmd.extend(['--scenario-name', scenario]) subprocess.call(cmd) diff --git a/tripleo_ansible/ansible_plugins/tests/molecule/tripleo_dnf_stream/molecule.yml b/tripleo_ansible/ansible_plugins/tests/molecule/tripleo_dnf_stream/molecule.yml index 821c6bcf5..4100636d8 100644 --- a/tripleo_ansible/ansible_plugins/tests/molecule/tripleo_dnf_stream/molecule.yml +++ b/tripleo_ansible/ansible_plugins/tests/molecule/tripleo_dnf_stream/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/aide/molecule/default/Dockerfile b/tripleo_ansible/roles/aide/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/aide/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/aide/molecule/default/molecule.yml b/tripleo_ansible/roles/aide/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/aide/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/aide/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/designate_bind_config/molecule/default/Dockerfile b/tripleo_ansible/roles/designate_bind_config/molecule/default/Dockerfile deleted file mode 100644 index 90646fff5..000000000 --- a/tripleo_ansible/roles/designate_bind_config/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2021 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/tripleo_ansible/roles/designate_bind_config/molecule/default/molecule.yml b/tripleo_ansible/roles/designate_bind_config/molecule/default/molecule.yml index 8b18ad84d..20d7e2005 100644 --- a/tripleo_ansible/roles/designate_bind_config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/designate_bind_config/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/login_defs/molecule/default/Dockerfile b/tripleo_ansible/roles/login_defs/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/login_defs/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml index 5b6cf7173..8182b2f5f 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml @@ -1,35 +1,12 @@ --- driver: name: podman - -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 name: ansible log: true diff --git a/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml index 5b6cf7173..5b32dc746 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml @@ -2,34 +2,12 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 name: ansible log: true diff --git a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/Dockerfile deleted file mode 100644 index 30e9e7534..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/molecule.yml index e019a046e..d403c92c7 100644 --- a/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_client/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml index 8958b2f4f..cbd75503c 100644 --- a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root diff --git a/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/Dockerfile deleted file mode 100644 index 30e9e7534..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/molecule.yml index 8b18ad84d..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_distribute_keys/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml index 8958b2f4f..cbd75503c 100644 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root diff --git a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml index 8958b2f4f..cbd75503c 100644 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml index 8958b2f4f..cbd75503c 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root diff --git a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/Dockerfile deleted file mode 100644 index 90646fff5..000000000 --- a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2021 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/tripleo_ansible/roles/tripleo_cephadm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/molecule.yml index 8b18ad84d..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml index f15a3a1ac..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml index e31a26377..e9261371f 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml @@ -21,4 +21,4 @@ - role: test_deps vars: test_deps_setup_tripleo: true - test_deps_setup_stream: false + test_deps_setup_stream: true diff --git a/tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml index 399ecd805..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml index 399ecd805..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml index d25b136c4..343b61a98 100644 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml index f15a3a1ac..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml index 399ecd805..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml index f15a3a1ac..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml index 143e81b24..ee73541e4 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml index b87f4b018..ccd0d0a64 100644 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/Dockerfile b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml index fe0b56eee..8b6463690 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: all_nodes_extra_map_data: {} @@ -254,7 +232,7 @@ provisioner: validate_ntp: true Standalone: hosts: - ubi8: {} + centos: {} log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml index 399ecd805..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml index 7c55ca1b6..10afaa2f3 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 vars: all_nodes_extra_map_data: {} @@ -256,7 +234,7 @@ provisioner: validate_ntp: true Standalone: hosts: - ubi8: + centos: datacentre: bb:bb:bb:bb:bb:bb log: true env: diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml index 036874f8e..0c8f5ee0e 100644 --- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: log: true env: diff --git a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile deleted file mode 100644 index 8943173f9..000000000 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml index a95b91c8c..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml @@ -2,29 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile deleted file mode 100644 index 8943173f9..000000000 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml index d06df73fa..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml @@ -2,35 +2,12 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 name: ansible log: true diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml index 7a116f6f4..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/Dockerfile b/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml b/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml index b6bddd0d4..3f36bd94f 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml index 36113c540..3f36bd94f 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/prepare.yml index f3cb18fc2..c55199019 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/prepare.yml @@ -20,5 +20,8 @@ vars: test_deps_extra_packages: - device-mapper-multipath + - python*setuptools + - libselinux-python* + - policycoreutils-python-utils roles: - role: test_deps diff --git a/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/Dockerfile b/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml b/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml index b6bddd0d4..3f36bd94f 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_network_config/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_network_config/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_network_config/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml index 0ce2020a5..a593806c6 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/prepare.yml index 27e23e495..f649bd537 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/prepare.yml @@ -19,3 +19,5 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - iputils diff --git a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml index aec924db2..5b32dc746 100644 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml index 19f2ce9bf..c85c2ce3c 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml @@ -2,34 +2,12 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 name: ansible log: true diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml index f665c2b0e..1be7a52da 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml @@ -22,6 +22,6 @@ name: test_deps vars: test_deps_setup_tripleo: true - test_deps_setup_stream: false + test_deps_setup_stream: true test_deps_extra_packages: - jq diff --git a/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/Dockerfile deleted file mode 100644 index 90646fff5..000000000 --- a/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2021 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/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/molecule.yml index ce8305cff..6fa83ad0a 100644 --- a/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovn_cluster/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile deleted file mode 100644 index ba8b5fb5f..000000000 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# 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 %} diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml index 58d326824..e15d7651d 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml @@ -2,29 +2,13 @@ driver: name: podman -log: true - -platforms: - - - name: centos8 - hostname: centos8 - image: quay.io/centos/centos:stream8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - volumes: - - /run/udev:/run/udev:ro - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: - - host - provisioner: + inventory: + hosts: + all: + hosts: + centos: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile deleted file mode 100644 index ba8b5fb5f..000000000 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# 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 %} diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml index b559d9901..e15d7651d 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml @@ -2,29 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: centos8 - hostname: centos8 - image: quay.io/centos/centos:stream8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - volumes: - - /run/udev:/run/udev:ro - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: - - host - - provisioner: + inventory: + hosts: + all: + hosts: + centos: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml index ec82e3b50..6894ebdbb 100644 --- a/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml index 0f25f28b4..6894ebdbb 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml @@ -2,29 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools cronie rsyslog - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml index 399ecd805..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml @@ -2,28 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/Dockerfile deleted file mode 100644 index 30e9e7534..000000000 --- a/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/molecule.yml index e019a046e..d403c92c7 100644 --- a/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_run_cephadm/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile b/tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml index d903f6ba3..6894ebdbb 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml index ec82e3b50..56a6e9e08 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml @@ -4,26 +4,6 @@ driver: log: true -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml index 4d4b763da..0ccdfa159 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml @@ -2,46 +2,24 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 children: allovercloud: hosts: - ubi8: + centos: ctlplane_ip: 10.0.0.1 - ctlplane_hostname: ubi8.ctlplane.localdomain + ctlplane_hostname: centos.ctlplane.localdomain internal_api_ip: 10.0.1.1 - internal_api_hostname: ubi8.internalapi.localdomain + internal_api_hostname: centos.internalapi.localdomain management_ip: 10.0.0.1 # no management_hostname - canonical_hostname: ubi8.localdomain + canonical_hostname: centos.localdomain tripleo_role_networks: [ctlplane, internal_api, management] log: true env: diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py index 04478afff..7c9bbc740 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py @@ -25,7 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[10.0.0.1]*,[ubi8.ctlplane.localdomain]*,[10.0.1.1]*,[ubi8.internalapi.localdomain]*,[ubi8.localdomain]*,[ubi8]* ssh-rsa AAAATEST', + '[10.0.0.1]*,[centos.ctlplane.localdomain]*,[10.0.1.1]*,[centos.internalapi.localdomain]*,[centos.localdomain]*,[centos]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/Dockerfile b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml index d8d18fbc5..a4b630a95 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml @@ -2,40 +2,18 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 children: allovercloud: hosts: - ubi8: + centos: log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py index 733e1d8ee..1ad69d40d 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py @@ -25,7 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[ubi8]* ssh-rsa AAAATEST', + '[centos]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml index cb1cf6375..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml @@ -2,36 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi:8.2 - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml index 76529ccb9..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml @@ -2,29 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml index 9326ebd1b..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml @@ -2,30 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/Dockerfile b/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/Dockerfile deleted file mode 100644 index 8fc73a838..000000000 --- a/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2020 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/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml b/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml index abfc2d0d4..ee73541e4 100644 --- a/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml @@ -2,35 +2,13 @@ driver: name: podman -log: true - -platforms: - - name: ubi8 - hostname: ubi8 - image: ubi8/ubi-init - registry: - url: registry.access.redhat.com - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: hosts: all: hosts: - ubi8: + centos: ansible_python_interpreter: /usr/bin/python3 log: true env: diff --git a/tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml index 9326ebd1b..b8aa37228 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml @@ -2,30 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - command: /sbin/init - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_unbound/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_unbound/molecule/default/Dockerfile deleted file mode 100644 index 90646fff5..000000000 --- a/tripleo_ansible/roles/tripleo_unbound/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2021 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/tripleo_ansible/roles/tripleo_unbound/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_unbound/molecule/default/molecule.yml index 51305d71a..20d7e2005 100644 --- a/tripleo_ansible/roles/tripleo_unbound/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_unbound/molecule/default/molecule.yml @@ -2,27 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: inventory: hosts: diff --git a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml index 201865d1c..6894ebdbb 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml @@ -2,29 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: diff --git a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# 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/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml index 201865d1c..6894ebdbb 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml @@ -2,29 +2,6 @@ driver: name: podman -log: true - -platforms: - - name: centos - hostname: centos - image: centos/centos:stream8 - registry: - url: quay.io - dockerfile: Dockerfile - pkg_extras: python*setuptools - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - - /etc/dnf/vars:/etc/dnf/vars - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - provisioner: name: ansible inventory: