X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=7e34fe6b3414fc3453551bbf7ca4cd229c2f6f46;hb=70c172ed632b78e9268d08cc637850e8b81e3060;hp=afa65a756ad7766248f86a5124e81e3b07eb7e12;hpb=492a570941534cb5a29af88607245d8376cadd43;p=releng%2Fbuilder.git diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index afa65a756..7e34fe6b3 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,188 +1,147 @@ --- - 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-custom 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 - 20181029-223513.438 + 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: 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: 3 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' - devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - - 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 - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148' - queens: - openstack-branch: 'master' - devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e' - odl-ml2-branch: 'master' + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}' +- project: + name: netvirt-csit-hwvtep-openstack-integration-fluorine + jobs: + - inttest-csit-hwvtep-openstack-custom + + project: 'netvirt' + stream: 'fluorine' + branch: 'stable/fluorine' + 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: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212' + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438 + 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: 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: 3 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' - devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - - 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 - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148' - queens: - openstack-branch: 'master' - devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e' - odl-ml2-branch: 'master' + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}' +- project: + name: netvirt-csit-hwvtep-openstack-integration-oxygen + jobs: + - inttest-csit-hwvtep-openstack-custom + + 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: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212' + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438 + 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: 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: 3 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' - devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299' - openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148' - - pike: - openstack-branch: 'stable/pike' - devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65' - odl-ml2-branch: 'stable/pike' + - queens: + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148' - openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148' - - 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 - 20171016-0212' - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}'