X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=6e794b77eb602ddb5c14b0066c32d9432fc9c6ee;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=52cee01d90d8ca59c552da0f8b212603ee1c6c14;hpb=bc31de6876a6a097c344b03b84427b5baf3f0e2a;p=releng%2Fbuilder.git diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 52cee01d9..6e794b77e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -7,7 +7,6 @@ project: 'netvirt' stream: 'oxygen' branch: 'master' - jre: 'openjdk8' topology: - 1node: @@ -35,29 +34,27 @@ - ocata: openstack-branch: 'stable/ocata' odl-ml2-branch: 'stable/ocata' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528' + openstack_system_image: '{openstack_system_image_ocata}' + openstack_system2_image: '{openstack_system_image_ocata}' - pike: openstack-branch: 'stable/pike' - devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65' odl-ml2-branch: 'stable/pike' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' - queens: openstack-branch: 'master' - devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e' odl-ml2-branch: 'master' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223' + 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: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548' + tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212' # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled enable-networking-l2gw: 'yes' @@ -70,7 +67,6 @@ project: 'netvirt' stream: 'nitrogen' branch: 'stable/nitrogen' - jre: 'openjdk8' topology: - 1node: @@ -100,29 +96,27 @@ - ocata: openstack-branch: 'stable/ocata' odl-ml2-branch: 'stable/ocata' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528' + openstack_system_image: '{openstack_system_image_ocata}' + openstack_system2_image: '{openstack_system_image_ocata}' - pike: openstack-branch: 'stable/pike' - devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65' odl-ml2-branch: 'stable/pike' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223' + openstack_system_image: '{openstack_system_image_pike}' + openstack_system2_image: '{openstack_system_image_pike}' - queens: openstack-branch: 'master' - devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e' odl-ml2-branch: 'master' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223' + 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: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548' + tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212' # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled enable-networking-l2gw: 'yes' @@ -136,7 +130,6 @@ stream: 'carbon' branch: 'stable/carbon' - jre: 'openjdk8' karaf-version: karaf3 topology: @@ -167,85 +160,21 @@ - ocata: openstack-branch: 'stable/ocata' odl-ml2-branch: 'stable/ocata' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528' + openstack_system_image: '{openstack_system_image_ocata}' + openstack_system2_image: '{openstack_system_image_ocata}' - pike: openstack-branch: 'stable/pike' - devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65' odl-ml2-branch: 'stable/pike' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223' + 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: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548' + tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212' # 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-boron - jobs: - - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' - - project: 'netvirt' - - stream: 'boron' - branch: 'stable/boron' - jre: 'openjdk8' - karaf-version: karaf3 - - topology: - - 1node: - openstack_system1_count: 1 - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system1_count: 1 - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - testplan: '{project}-{topology}-l2gw-openstack.txt' - - functionality: - - upstream-transparent: - schedule: '' - sg-mode: 'transparent' - - upstream-stateful: - schedule: '' - sg-mode: 'stateful' - - upstream-learn: - schedule: '' - sg-mode: 'learn' - - gate-stateful: - schedule: '' - sg-mode: 'stateful' - - openstack: - - newton: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - - newton-nodl-v2: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - odl-ml2-driver-version: 'v2' - - openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528' - openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528' - security-group-mode: '{sg-mode}' - - tools_system_count: 2 - tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548' - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - enable-openstack-services: 'neutron,nova,l2gw-plugin' -