X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=7da5ac97e6a428e38170e4303edd74ffa04b6aad;hb=a7aea65dd37dae9a78104187887b20c3a9974aba;hp=27f79f1f5b52e5390e02c0f414727c55592f0c9d;hpb=1675c37fad56e80bea0104a309bf8c0e55fc3d41;p=releng%2Fbuilder.git diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 27f79f1f5..7da5ac97e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,149 +1,97 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-aluminium + name: netvirt-csit-hwvtep-openstack-integration-master-rocky jobs: - inttest-csit-hwvtep-openstack-custom - - project: 'netvirt' - stream: 'aluminium' - branch: 'master' - jre: 'openjdk11' - 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 - x86_64 - 20200601-180138.390 - 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: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-magnesium - jobs: - - inttest-csit-hwvtep-openstack-custom - - project: 'netvirt' - stream: 'magnesium' - branch: 'stable/magnesium' - jre: 'openjdk11' - 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 + project: "netvirt" + stream: "master" + branch: "master" + jre: "openjdk11" + 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: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390 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' + enable-networking-l2gw: "yes" topology: - 1node: openstack_system2_count: 2 odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' + enable-haproxy: "no" + install-features: "odl-netvirt-openstack" - 3node: openstack_system2_count: 3 odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' + enable-haproxy: "yes" + install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - upstream-stateful - gate-stateful openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + - rocky: + openstack-branch: "stable/rocky" + odl-ml2-branch: "stable/rocky" + odl-ml2-port-binding: "pseudo-agentdb-binding" + openstack_system_image: "{openstack_rocky_system_image}" + openstack_system2_image: "{openstack_rocky_system_image}" - project: - name: netvirt-csit-hwvtep-openstack-integration-sodium + name: netvirt-csit-hwvtep-openstack-integration-master-stein jobs: - inttest-csit-hwvtep-openstack-custom - project: 'netvirt' - stream: 'sodium' - branch: 'stable/sodium' - 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 + project: "netvirt" + stream: "master" + branch: "master" + jre: "openjdk11" + 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: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390 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' + enable-networking-l2gw: "yes" topology: - 1node: openstack_system2_count: 2 odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' + enable-haproxy: "no" + install-features: "odl-netvirt-openstack" - 3node: openstack_system2_count: 3 odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' + enable-haproxy: "yes" + install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - upstream-stateful - gate-stateful openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' + - stein: + openstack-branch: "stable/stein" + odl-ml2-branch: "stable/stein" + odl-ml2-port-binding: "pseudo-agentdb-binding" + openstack_system_image: "{openstack_stein_system_image}" + openstack_system2_image: "{openstack_stein_system_image}"