X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=02475d741d793ed0b7799d9af5b7e687d900bab4;hb=9712aebd07d323d91d7e9f7f1392ae7768338644;hp=c368819001c838084b782778a6e05d582519bf85;hpb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c368819001..02475d741d 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: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -22,6 +22,7 @@
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
@@ -43,12 +44,6 @@
           schedule: ''
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          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'
@@ -57,8 +52,8 @@
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          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}'
@@ -76,9 +71,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -107,12 +102,6 @@
           schedule: ''
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          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'
@@ -121,8 +110,8 @@
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          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}'
@@ -140,9 +129,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -167,12 +156,6 @@
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          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'
@@ -181,8 +164,8 @@
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          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}'
@@ -201,9 +184,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -249,8 +232,8 @@
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-4
-    openstack_system2_flavor: v2-standard-2
+    odl_system_flavor: odl-standard-4
+    openstack_system2_flavor: odl-standard-2
 
     topology:
       - 1node:
@@ -267,8 +250,10 @@
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -276,10 +261,9 @@
           karaf-version: karaf3
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          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: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'