diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml index f448198fe..e65a86ce1 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/converge.yml b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/converge.yml index b02935243..ed50a7c0d 100644 --- a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/converge.yml +++ b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/converge.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/converge.yml b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/converge.yml index 5aafeaee7..fb70ad1c1 100644 --- a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/converge.yml +++ b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/converge.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 f433cdc49..5b6cf7173 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 f433cdc49..5b6cf7173 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 5c64f357d..6320dc015 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -66,7 +66,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_package_action/molecule/default/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml index f433cdc49..5b6cf7173 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 f433cdc49..5b6cf7173 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 f433cdc49..5b6cf7173 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 f433cdc49..5b6cf7173 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_common/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml index c238db8e1..8958b2f4f 100644 --- a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_common/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 c238db8e1..8958b2f4f 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_ceph_uuid/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml index c238db8e1..8958b2f4f 100644 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_uuid/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_work_dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml index c238db8e1..8958b2f4f 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 @@ -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 665406ce8..f15a3a1ac 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 9b5c2b3fb..b0d5a8e09 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 9b5c2b3fb..b0d5a8e09 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 9b5c2b3fb..b0d5a8e09 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/converge.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml index cd51a2629..9e8d6617a 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml @@ -162,7 +162,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 665406ce8..f15a3a1ac 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 665406ce8..f15a3a1ac 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 665406ce8..f15a3a1ac 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_derived_parameters/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml index ce17cef2e..abfc2d0d4 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_derived_parameters/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 665406ce8..f15a3a1ac 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_hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml index 631cfe817..50fdd5415 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 9b5c2b3fb..b0d5a8e09 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 f547df53c..e77022901 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 d83ebe958..1f53bb01d 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 e1eec84b8..d06df73fa 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/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_image_serve/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml index e1eec84b8..d06df73fa 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 @@ -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_lvmfilter/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml index e528551da..42c237b71 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 91381a52e..1990a67f5 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 91381a52e..1990a67f5 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 91381a52e..1990a67f5 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_network_config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml index 6c5114e83..493867993 100644 --- a/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_network_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_network_config/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_network_config/molecule/default/prepare.yml index cfd224fe3..34961e8bb 100644 --- a/tripleo_ansible/roles/tripleo_network_config/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_network_config/molecule/default/prepare.yml @@ -17,6 +17,9 @@ - name: Prepare hosts: all + vars: + test_deps_setup_tripleo: true + test_deps_setup_stream: false tasks: - import_role: name: test_deps 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 7e2b3b9e1..d54c7e5fd 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml @@ -5,33 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: 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 f433cdc49..5b6cf7173 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 @@ -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 62ff21687..19f2ce9bf 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_persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml index bcb4e1144..d903f6ba3 100644 --- a/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_persist/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_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_puppet_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml index 9b5c2b3fb..b0d5a8e09 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/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_puppet_cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml index 2c1cbd781..1b4342049 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml @@ -18,6 +18,7 @@ - name: Prepare hosts: all vars: + test_deps_setup_stream: false required_packages: - facter - rsync @@ -25,7 +26,7 @@ - role: test_deps post_tasks: - name: Create tripleo repos - command: tripleo-repos current-tripleo + command: tripleo-repos --no-stream current-tripleo become: true - name: Install required packages become: true diff --git a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml index 9b5c2b3fb..b0d5a8e09 100644 --- a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_redhat_enforce/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_redhat_enforce/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/prepare.yml index 27e23e495..63c08680d 100644 --- a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/prepare.yml @@ -17,5 +17,7 @@ - name: Prepare hosts: all + vars: + test_deps_setup_stream: false roles: - role: test_deps diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml index bcb4e1144..d903f6ba3 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 bcb4e1144..d903f6ba3 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 5060c7bdb..4d4b763da 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 c13b9e5cf..d8d18fbc5 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_sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml index d6a52a87a..cb1cf6375 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/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_sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml index d6a52a87a..cb1cf6375 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/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_systemd_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml index 2f2f72a31..e57d496bb 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml @@ -18,6 +18,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_timemaster/molecule/defaults/molecule.yml b/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml index ce17cef2e..abfc2d0d4 100644 --- a/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timemaster/molecule/defaults/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_timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml index 2f2f72a31..e57d496bb 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml @@ -18,6 +18,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 d14d7ecbd..474ace9c5 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/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_validations_package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml index 673e06cf5..b2a70c6df 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/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_validations_package/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml index a5b2d7a39..a7004a475 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml @@ -17,9 +17,11 @@ - name: Prepare hosts: all + vars: + test_deps_setup_stream: false roles: - role: test_deps post_tasks: - name: Create tripleo repos - command: tripleo-repos current-tripleo + command: tripleo-repos --no-stream current-tripleo become: true diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e42cf2bec..1be8b3495 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -2,7 +2,7 @@ - job: description: Base tripleo-ansible job 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/molecule.yaml b/zuul.d/molecule.yaml index a9656ca2d..bcfe11d53 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -410,6 +410,7 @@ - ^tripleo_ansible/roles/tripleo_ovs_dpdk/.* name: tripleo-ansible-centos-8-molecule-tripleo_ovs_dpdk parent: tripleo-ansible-centos-8-base + voting: false vars: tripleo_role_name: tripleo_ovs_dpdk - job: @@ -417,6 +418,7 @@ - ^tripleo_ansible/roles/tripleo_packages/.* name: tripleo-ansible-centos-8-molecule-tripleo_packages parent: tripleo-ansible-centos-8-base + voting: false vars: tripleo_role_name: tripleo_packages - job: diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index ad983f563..429e76668 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -40,6 +40,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