X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=7e34fe6b3414fc3453551bbf7ca4cd229c2f6f46;hb=4b526239b3edeb5e38ea0f71eee22c423c5ad434;hp=e2130df801e0a5a66ab096f2913636e7aeb848ab;hpb=28c73057560c34d1fadad99c702461cdb8c9f0c7;p=releng%2Fbuilder.git diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index e2130df80..7e34fe6b3 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,159 +1,147 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-fluorine + name: netvirt-csit-hwvtep-openstack-integration-neon jobs: - - inttest-csit-hwvtep-openstack + - inttest-csit-hwvtep-openstack-custom project: 'netvirt' - stream: 'fluorine' + 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-standard-8 - openstack_system_flavor: odl-standard-8 - openstack_system2_flavor: odl-standard-4 + 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 - 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_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_system2_count: 1 + openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' functionality: - upstream-stateful - gate-stateful openstack: - - 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}' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}' - project: - name: netvirt-csit-hwvtep-openstack-integration-oxygen + name: netvirt-csit-hwvtep-openstack-integration-fluorine jobs: - - inttest-csit-hwvtep-openstack + - inttest-csit-hwvtep-openstack-custom project: 'netvirt' - stream: 'oxygen' - branch: 'stable/oxygen' + 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: 'stateful' - odl_system_flavor: odl-standard-8 - openstack_system_flavor: odl-standard-8 - openstack_system2_flavor: odl-standard-4 + 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 - 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_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_system2_count: 1 + openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' functionality: - upstream-stateful - gate-stateful openstack: - - 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}' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}' - project: - name: netvirt-csit-hwvtep-openstack-integration-nitrogen + name: netvirt-csit-hwvtep-openstack-integration-oxygen jobs: - - inttest-csit-hwvtep-openstack + - inttest-csit-hwvtep-openstack-custom project: 'netvirt' - stream: 'nitrogen' - branch: 'stable/nitrogen' + 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: odl-standard-8 - openstack_system_flavor: odl-standard-8 - openstack_system2_flavor: odl-standard-4 + 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 - 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_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_system2_count: 1 + openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' functionality: - upstream-stateful - gate-stateful openstack: - - 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}' + openstack_system_image: '{openstack_queens_system_image}' + openstack_system2_image: '{openstack_queens_system_image}'