Browse Source

Merge "Fix ovs_dpdk molecule job to work with stream node" into stable/victoria

changes/65/789865/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
b3cff08c7b
5 changed files with 12 additions and 41 deletions
  1. +3
    -21
      tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml
  2. +1
    -0
      tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml
  3. +7
    -19
      tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml
  4. +1
    -0
      tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml
  5. +0
    -1
      zuul.d/molecule.yaml

+ 3
- 21
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml View File

@ -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


+ 1
- 0
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml View File

@ -20,6 +20,7 @@
become: true
vars:
test_deps_setup_tripleo: true
test_deps_setup_stream: true
roles:
- role: test_deps
post_tasks:


+ 7
- 19
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml View File

@ -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


+ 1
- 0
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml View File

@ -20,6 +20,7 @@
become: true
vars:
test_deps_setup_tripleo: true
test_deps_setup_stream: true
roles:
- role: test_deps
post_tasks:


+ 0
- 1
zuul.d/molecule.yaml View File

@ -411,7 +411,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:


Loading…
Cancel
Save