X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=6aff8bf1e395f776d70937a027d96aa92f2ad959;hb=0d5a8d815bbc7a7601ae657dfde54cf3ff909ba1;hp=2537b1b1da0051d3a6131141f87d10e71afaaa31;hpb=fafc613b71acb996cd3340e42e401ce8382491a6;p=releng%2Fbuilder.git diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 2537b1b1d..6aff8bf1e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,20 +1,20 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-oxygen + name: netvirt-csit-hwvtep-openstack-integration-fluorine jobs: - inttest-csit-hwvtep-openstack project: 'netvirt' - stream: 'oxygen' + 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}' - odl_system_flavor: v1-performance-8 - openstack_system_flavor: v1-performance-8 - openstack_system2_flavor: v1-performance-4 + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 @@ -23,31 +23,74 @@ topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' 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: '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}' + +- 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: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + 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' + + topology: + - 1node: + openstack_system2_count: 1 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack' + - 3node: + openstack_system2_count: 1 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack' + + functionality: + - upstream-stateful + - gate-stateful + + openstack: - pike: openstack-branch: 'stable/pike' odl-ml2-branch: 'stable/pike' @@ -56,8 +99,8 @@ 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}' @@ -74,10 +117,10 @@ odl-ml2-driver-version: 'v2' enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' - security-group-mode: '{sg-mode}' - odl_system_flavor: v1-performance-8 - openstack_system_flavor: v1-performance-8 - openstack_system2_flavor: v1-performance-4 + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 @@ -86,32 +129,21 @@ topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful: - 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}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - pike: openstack-branch: 'stable/pike' odl-ml2-branch: 'stable/pike' @@ -120,8 +152,8 @@ 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}' @@ -132,7 +164,6 @@ - inttest-csit-hwvtep-openstack project: 'netvirt' - stream: 'carbon' branch: 'stable/carbon' karaf-version: karaf3 @@ -140,10 +171,10 @@ odl-ml2-driver-version: 'v2' enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' - security-group-mode: '{sg-mode}' - odl_system_flavor: v1-performance-8 - openstack_system_flavor: v1-performance-8 - openstack_system2_flavor: v1-performance-4 + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 @@ -152,24 +183,19 @@ topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - - upstream-stateful: - sg-mode: 'stateful' - - gate-stateful: - schedule: '' - sg-mode: 'stateful' + - upstream-stateful + - gate-stateful openstack: - ocata: