diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml index b09d8ba14..ec8e319c7 100644 --- a/_skeleton_role_/molecule/default/molecule.yml +++ b/_skeleton_role_/molecule/default/molecule.yml @@ -15,6 +15,7 @@ platforms: 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') }}" diff --git a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/playbook.yml b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/playbook.yml index b02935243..ed50a7c0d 100644 --- a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/playbook.yml +++ b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/playbook.yml @@ -86,7 +86,7 @@ - name: Check failed image pull podman_container: name: container - image: ineverneverneverexist + image: quay.io/ineverneverneverexist state: present command: sleep 1d register: imagefail @@ -96,8 +96,6 @@ assert: that: - imagefail is failed - - imagefail.msg == "Can't pull image ineverneverneverexist" - - name: Force container recreate podman_container: diff --git a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/playbook.yml b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/playbook.yml index 5aafeaee7..fb70ad1c1 100644 --- a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/playbook.yml +++ b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/playbook.yml @@ -40,14 +40,6 @@ - name: Dump podman container inspect result debug: var=existing_container - - name: Comparison with 'podman container inspect' - command: podman container inspect "{{ container_name }}" - register: podman_inspect - - - name: Convert podman inspect output to JSON - set_fact: - podman_inspect_result: "{{ podman_inspect.stdout | from_json }}" - - name: Cleanup command: podman container rm -f {{ container_name }} @@ -56,8 +48,6 @@ that: - "'containers' in existing_container" - existing_container.containers - - "existing_container.containers == podman_inspect_result" - - all_containers.containers == existing_container.containers always: - name: Delete all container leftovers from tests diff --git a/tripleo_ansible/roles/aide/molecule/default/molecule.yml b/tripleo_ansible/roles/aide/molecule/default/molecule.yml index ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/aide/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/aide/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml index 7421a7267..e0c92c28a 100644 --- a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/test_deps/defaults/main.yml b/tripleo_ansible/roles/test_deps/defaults/main.yml index 4bc5abdfb..0665487dd 100644 --- a/tripleo_ansible/roles/test_deps/defaults/main.yml +++ b/tripleo_ansible/roles/test_deps/defaults/main.yml @@ -19,3 +19,4 @@ test_deps_extra_packages: [] test_deps_setup_tripleo: false test_deps_repo_version: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master" test_deps_mirrors_file_path: /etc/ci/mirror_info.sh +test_deps_setup_stream: true diff --git a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml index f433cdc49..5b6cf7173 100644 --- a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index c3b17c1d7..9f4a1cda9 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -67,7 +67,7 @@ - test_deps_setup_tripleo | bool block: - name: Create tripleo repos - command: tripleo-repos -b master current-tripleo + command: tripleo-repos {{ test_deps_setup_stream | ternary('--stream', '--no-stream', omit) }} -b master current-tripleo - name: Install tripleo packages package: diff --git a/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml b/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml index 9c8cc02eb..4e3921d39 100644 --- a/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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 - /tmp:/tmp privileged: true environment: &env 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 ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml index ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 4b1961fcf..52fa78c38 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 @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 248e091dc..59f843f43 100644 --- a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 def93f57c..e31a26377 100644 --- a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/prepare.yml @@ -21,3 +21,4 @@ - role: test_deps vars: test_deps_setup_tripleo: true + test_deps_setup_stream: false diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml index 7421a7267..e0c92c28a 100644 --- a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 7421a7267..e0c92c28a 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 @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 cd30b9e1e..140595787 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 @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml index 517c7137a..caae9025b 100644 --- a/tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml @@ -181,7 +181,7 @@ - name: Assert that fedora container has not been re-created assert: that: - - fedora_infos_new == fedora_infos_old + - fedora_infos_new['containers'][0]['Id'] == fedora_infos_old['containers'][0]['Id'] fail_msg: 'fedora container was wrongly re-created' success_msg: 'fedora container was not re-created' when: 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 95d81a298..48ab3dd6f 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 95d81a298..48ab3dd6f 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 95d81a298..48ab3dd6f 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 6cfc44d50..79c274725 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml index 95d81a298..48ab3dd6f 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 2d64bfbab..a3fe7d15c 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 e56902a8d..64b8b61a3 100644 --- a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 a9bea054e..f3eabafce 100644 --- a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml @@ -22,6 +22,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml index be2135168..5e8c591e0 100644 --- a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml @@ -17,6 +17,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml index ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml index ef1200188..889ccf693 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 2fcaa5696..deed7ce85 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 @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 82cc99bd5..8769a23bb 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 @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 6b1370e21..ca0ee7563 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml @@ -21,6 +21,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml index 42af3c9ef..96ef1583d 100644 --- a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml @@ -21,6 +21,7 @@ platforms: - /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') }}" 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 5ed6bd847..7c8c063bb 100644 --- a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 372c89556..47a9d4001 100644 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/prepare.yml index 95fd06723..052ee60e7 100644 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/prepare.yml @@ -21,6 +21,7 @@ - role: test_deps vars: test_deps_setup_tripleo: true + test_deps_setup_stream: false post_tasks: - name: Create paths diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml index a58b7d737..2ba8e25f8 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 e9aae2d4b..479531bb6 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/custom_config/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml index e9aae2d4b..479531bb6 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 e9aae2d4b..479531bb6 100644 --- a/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml +++ b/tripleo_ansible/roles/tripleo_multipathd/molecule/preexisting_config/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" 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 242224c0b..d53a2090e 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml index 16fbb6410..c2396f6cf 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml @@ -16,6 +16,7 @@ platforms: - /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') }}" diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml index 19b1efea2..f665c2b0e 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/prepare.yml @@ -22,5 +22,6 @@ name: test_deps vars: test_deps_setup_tripleo: true + test_deps_setup_stream: false test_deps_extra_packages: - jq diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml deleted file mode 100644 index f2aa1e640..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -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: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - -provisioner: - name: ansible - log: true - env: - ANSIBLE_STDOUT_CALLBACK: yaml - -scenario: - test_sequence: - - destroy - - create - - prepare - - converge - - verify - - destroy - -verifier: - name: testinfra diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml deleted file mode 100644 index dcf4c877e..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -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 openvswitch numactl-libs* unbound-libs* - easy_install: - - pip - command: /sbin/init - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - - /opt/yum.repos.d:/etc/yum.repos.d:rw - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - -provisioner: - name: ansible - log: true - env: - ANSIBLE_STDOUT_CALLBACK: yaml - ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH:-/usr/share/ansible/roles}:${HOME}/zuul-jobs/roles" - ANSIBLE_LIBRARY: "${ANSIBLE_LIBRARY:-/usr/share/ansible/plugins/modules}" - ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}" - ANSIBLE_ACTION_PLUGINS: "${ANSIBLE_ACTION_PLUGINS:-/usr/share/ansible/plugins/action}" - -scenario: - test_sequence: - - destroy - - create - - prepare - - converge - - verify - - destroy - -verifier: - name: testinfra diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml deleted file mode 100644 index 6ea4949be..000000000 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -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 - privileged: true - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host - -provisioner: - name: ansible - log: true - env: - ANSIBLE_STDOUT_CALLBACK: yaml - -scenario: - test_sequence: - - destroy - - create - - prepare - - converge - - check - - verify - - destroy - -verifier: - name: testinfra diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 716eec853..a0f19e555 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -2,7 +2,7 @@ - job: description: Base tripleo-ansible job on CentOS 8 name: tripleo-ansible-centos-8-base - nodeset: centos-8 + nodeset: centos-8-stream parent: base success-url: "reports.html" failure-url: "reports.html" diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index 578838cf3..56ae1d8ce 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -41,6 +41,13 @@ virtualenv_command: "{{ ensure_pip_virtualenv_command }}" virtualenv_site_packages: true + - name: Set containers module to 3.0 + become: true + shell: | + dnf module disable container-tools:rhel8 -y + dnf module enable container-tools:3.0 -y + dnf clean metadata + - name: Run bindep shell: |- . {{ ansible_user_dir }}/test-python/bin/activate