Fix ovs_dpdk molecule job to work with stream node
Remove centos7 image. Use stream image for CentOS 8.
Change-Id: I9853497e34e203b6ae72ceaa944aa122f9c5d161
(cherry picked from commit 78c2b8313c
)
This commit is contained in:
parent
4f7ce5e300
commit
e25baba160
|
@ -5,29 +5,10 @@ driver:
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
platforms:
|
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
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
image: centos:8
|
image: quay.io/centos/centos:stream8
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
|
@ -40,7 +21,8 @@ platforms:
|
||||||
- /lib/modules:/lib/modules
|
- /lib/modules:/lib/modules
|
||||||
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
||||||
privileged: true
|
privileged: true
|
||||||
ulimits: *ulimit
|
ulimits:
|
||||||
|
- host
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
become: true
|
become: true
|
||||||
vars:
|
vars:
|
||||||
test_deps_setup_tripleo: true
|
test_deps_setup_tripleo: true
|
||||||
|
test_deps_setup_stream: true
|
||||||
roles:
|
roles:
|
||||||
- role: test_deps
|
- role: test_deps
|
||||||
post_tasks:
|
post_tasks:
|
||||||
|
|
|
@ -5,26 +5,9 @@ driver:
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
platforms:
|
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
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
image: centos:8
|
image: quay.io/centos/centos:stream8
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
|
@ -32,9 +15,14 @@ platforms:
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
command: /sbin/init
|
command: /sbin/init
|
||||||
volumes:
|
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
|
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
||||||
privileged: true
|
privileged: true
|
||||||
ulimits: *ulimit
|
ulimits:
|
||||||
|
- host
|
||||||
|
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
become: true
|
become: true
|
||||||
vars:
|
vars:
|
||||||
test_deps_setup_tripleo: true
|
test_deps_setup_tripleo: true
|
||||||
|
test_deps_setup_stream: true
|
||||||
roles:
|
roles:
|
||||||
- role: test_deps
|
- role: test_deps
|
||||||
post_tasks:
|
post_tasks:
|
||||||
|
|
|
@ -410,7 +410,6 @@
|
||||||
- ^tripleo_ansible/roles/tripleo_ovs_dpdk/.*
|
- ^tripleo_ansible/roles/tripleo_ovs_dpdk/.*
|
||||||
name: tripleo-ansible-centos-8-molecule-tripleo_ovs_dpdk
|
name: tripleo-ansible-centos-8-molecule-tripleo_ovs_dpdk
|
||||||
parent: tripleo-ansible-centos-8-base
|
parent: tripleo-ansible-centos-8-base
|
||||||
voting: false
|
|
||||||
vars:
|
vars:
|
||||||
tripleo_role_name: tripleo_ovs_dpdk
|
tripleo_role_name: tripleo_ovs_dpdk
|
||||||
- job:
|
- job:
|
||||||
|
|
Loading…
Reference in New Issue