X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=db97acfc27f6e1207661b6c580ef323339bd986f;hb=89a0003414c9a0e8e1e5bdd14ee0df9e26a10a9b;hp=3ecb36e36644b8604d4bc6566a5cc38992647681;hpb=f9f11bcf950079a75cb097dbb5ac614583e40738;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 3ecb36e36..db97acfc2 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -12,9 +12,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -39,7 +39,7 @@
           testplan: '{project}-{topology}-minimal-openstack.txt'
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip.txt'
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
 
     openstack:
@@ -48,12 +48,14 @@
           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'
           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: 'master'
           odl-ml2-branch: 'master'
@@ -74,9 +76,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -106,12 +108,14 @@
           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'
           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: 'master'
           odl-ml2-branch: 'master'
@@ -133,9 +137,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -165,12 +169,14 @@
           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'
           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}'
 
 - project:
     name: netvirt-csit-sfc-openstack-integration
@@ -179,8 +185,8 @@
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-4
-    openstack_system2_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:
@@ -212,3 +218,4 @@
           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}'