---
- project:
- name: netvirt-csit-hwvtep-openstack-integration-oxygen
+ name: netvirt-csit-hwvtep-openstack-integration-neon
jobs:
- - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+ - inttest-csit-hwvtep-openstack
project: 'netvirt'
- stream: 'oxygen'
+ stream: 'neon'
branch: 'master'
+ testplan: '{project}-{topology}-l2gw-openstack.txt'
+ odl-ml2-driver-version: 'v2'
+ enable-openstack-services: 'placement-api,l2gw-plugin'
+ enable-openstack-compute-services: 'placement-client'
+ security-group-mode: 'stateful'
+ odl_system_flavor: odl-highcpu-8
+ openstack_system_flavor: odl-highcpu-8
+ openstack_system2_flavor: odl-highcpu-4
+ tools_system_count: 2
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+ os-cmb-cnt: 0
+ os-ctl-cnt: 1
+ os-cmp-cnt: 2
+
+ # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+ enable-networking-l2gw: 'yes'
topology:
- 1node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 1
enable-haproxy: 'no'
- install-features: 'odl-netvirt-openstack'
+ install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
- 3node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 3
enable-haproxy: 'yes'
- install-features: 'odl-jolokia,odl-netvirt-openstack'
-
- testplan: '{project}-{topology}-l2gw-openstack.txt'
+ install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
functionality:
- - upstream-stateful:
- sg-mode: 'stateful'
- - gate-stateful:
- sg-mode: 'stateful'
+ - upstream-stateful
+ - gate-stateful
openstack:
- - ocata:
- openstack-branch: 'stable/ocata'
- odl-ml2-branch: 'stable/ocata'
- openstack_system_image: '{openstack_system_image_ocata}'
- openstack_system2_image: '{openstack_system_image_ocata}'
- pike:
openstack-branch: 'stable/pike'
odl-ml2-branch: 'stable/pike'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
openstack_system_image: '{openstack_system_image_pike}'
openstack_system2_image: '{openstack_system_image_pike}'
+ enable-openstack-network-services: '{openstack_legacy_default_network_services}'
- queens:
- openstack-branch: 'master'
- odl-ml2-branch: 'master'
+ openstack-branch: 'stable/queens'
+ odl-ml2-branch: 'stable/queens'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
- openstack_system_image: '{openstack_system_image_pike}'
- openstack_system2_image: '{openstack_system_image_pike}'
+ openstack_system_image: '{openstack_system_image_queens}'
+ openstack_system2_image: '{openstack_system_image_queens}'
+- project:
+ name: netvirt-csit-hwvtep-openstack-integration-fluorine
+ jobs:
+ - inttest-csit-hwvtep-openstack
+
+ project: 'netvirt'
+ stream: 'fluorine'
+ branch: 'master'
+ testplan: '{project}-{topology}-l2gw-openstack.txt'
odl-ml2-driver-version: 'v2'
enable-openstack-services: 'placement-api,l2gw-plugin'
enable-openstack-compute-services: 'placement-client'
- security-group-mode: '{sg-mode}'
+ security-group-mode: 'stateful'
+ odl_system_flavor: odl-highcpu-8
+ openstack_system_flavor: odl-highcpu-8
+ openstack_system2_flavor: odl-highcpu-4
tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+ os-cmb-cnt: 0
+ os-ctl-cnt: 1
+ os-cmp-cnt: 2
# TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
-- project:
- name: netvirt-csit-hwvtep-openstack-integration-nitrogen
- jobs:
- - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
- project: 'netvirt'
- stream: 'nitrogen'
- branch: 'stable/nitrogen'
-
topology:
- 1node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 1
enable-haproxy: 'no'
- install-features: 'odl-netvirt-openstack'
+ install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
- 3node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 3
enable-haproxy: 'yes'
- install-features: 'odl-jolokia,odl-netvirt-openstack'
-
- testplan: '{project}-{topology}-l2gw-openstack.txt'
+ install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
functionality:
- - upstream-stateful:
- schedule: ''
- sg-mode: 'stateful'
- - gate-stateful:
- schedule: ''
- sg-mode: 'stateful'
+ - upstream-stateful
+ - gate-stateful
openstack:
- - ocata:
- openstack-branch: 'stable/ocata'
- odl-ml2-branch: 'stable/ocata'
- openstack_system_image: '{openstack_system_image_ocata}'
- openstack_system2_image: '{openstack_system_image_ocata}'
- pike:
openstack-branch: 'stable/pike'
odl-ml2-branch: 'stable/pike'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
openstack_system_image: '{openstack_system_image_pike}'
openstack_system2_image: '{openstack_system_image_pike}'
+ enable-openstack-network-services: '{openstack_legacy_default_network_services}'
- queens:
- openstack-branch: 'master'
- odl-ml2-branch: 'master'
+ openstack-branch: 'stable/queens'
+ odl-ml2-branch: 'stable/queens'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
- openstack_system_image: '{openstack_system_image_pike}'
- openstack_system2_image: '{openstack_system_image_pike}'
+ openstack_system_image: '{openstack_system_image_queens}'
+ openstack_system2_image: '{openstack_system_image_queens}'
+- project:
+ name: netvirt-csit-hwvtep-openstack-integration-oxygen
+ jobs:
+ - inttest-csit-hwvtep-openstack
+
+ project: 'netvirt'
+ stream: 'oxygen'
+ branch: 'stable/oxygen'
+ testplan: '{project}-{topology}-l2gw-openstack.txt'
odl-ml2-driver-version: 'v2'
enable-openstack-services: 'placement-api,l2gw-plugin'
enable-openstack-compute-services: 'placement-client'
- security-group-mode: '{sg-mode}'
+ security-group-mode: 'stateful'
+ odl_system_flavor: odl-highcpu-8
+ openstack_system_flavor: odl-highcpu-8
+ openstack_system2_flavor: odl-highcpu-4
tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+ os-cmb-cnt: 0
+ os-ctl-cnt: 1
+ os-cmp-cnt: 2
# TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
-- project:
- name: netvirt-csit-hwvtep-openstack-integration-carbon
- jobs:
- - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
- project: 'netvirt'
-
- stream: 'carbon'
- branch: 'stable/carbon'
- karaf-version: karaf3
-
topology:
- 1node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 1
enable-haproxy: 'no'
- install-features: 'odl-netvirt-openstack'
+ install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
- 3node:
- openstack_system1_count: 1
- openstack_system2_count: 1
+ openstack_system2_count: 2
odl_system_count: 3
enable-haproxy: 'yes'
- install-features: 'odl-jolokia,odl-netvirt-openstack'
-
- testplan: '{project}-{topology}-l2gw-openstack.txt'
+ install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
functionality:
- - upstream-stateful:
- schedule: ''
- sg-mode: 'stateful'
- - gate-stateful:
- schedule: ''
- sg-mode: 'stateful'
+ - upstream-stateful
+ - gate-stateful
openstack:
- - ocata:
- openstack-branch: 'stable/ocata'
- odl-ml2-branch: 'stable/ocata'
- openstack_system_image: '{openstack_system_image_ocata}'
- openstack_system2_image: '{openstack_system_image_ocata}'
- pike:
openstack-branch: 'stable/pike'
odl-ml2-branch: 'stable/pike'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
openstack_system_image: '{openstack_system_image_pike}'
openstack_system2_image: '{openstack_system_image_pike}'
-
- odl-ml2-driver-version: 'v2'
- enable-openstack-services: 'placement-api,l2gw-plugin'
- enable-openstack-compute-services: 'placement-client'
- security-group-mode: '{sg-mode}'
- tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
- # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
- enable-networking-l2gw: 'yes'
+ enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+ - queens:
+ openstack-branch: 'stable/queens'
+ odl-ml2-branch: 'stable/queens'
+ odl-ml2-port-binding: 'pseudo-agentdb-binding'
+ openstack_system_image: '{openstack_system_image_queens}'
+ openstack_system2_image: '{openstack_system_image_queens}'