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 1f1c3ffa4..58d326824 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml @@ -5,29 +5,10 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: &env - 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: &ulimit - - host - name: centos8 hostname: centos8 - image: centos:8 + image: quay.io/centos/centos:stream8 dockerfile: Dockerfile pkg_extras: python*-setuptools environment: @@ -40,7 +21,8 @@ platforms: - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true - ulimits: *ulimit + ulimits: + - host provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml index f66847180..a968b40f0 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml @@ -20,6 +20,7 @@ become: true vars: test_deps_setup_tripleo: true + test_deps_setup_stream: true roles: - role: test_deps post_tasks: 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 ff5763060..b559d9901 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml @@ -5,26 +5,9 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: &ulimit - - host - - name: centos8 hostname: centos8 - image: centos:8 + image: quay.io/centos/centos:stream8 dockerfile: Dockerfile pkg_extras: python*-setuptools environment: @@ -32,9 +15,14 @@ platforms: 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: *ulimit + ulimits: + - host + provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml index f66847180..a968b40f0 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml @@ -20,6 +20,7 @@ become: true vars: test_deps_setup_tripleo: true + test_deps_setup_stream: true roles: - role: test_deps post_tasks: diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index a0571ffd6..831967d2c 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -470,7 +470,6 @@ - ^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: