X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=40b7802053aecbae1cae75eee2c125f2fe1849d1;hb=acb0c7c60dad3e06ddcfb29bcd76a6297c10c128;hp=b4e912d6b9999ecad077330b980eb2491a321a6a;hpb=e47a8ddb18b82790e048d312170c643c3a251dd8;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index b4e912d6b..40b780205 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -67,13 +67,6 @@
           odl-snat-mode: 'conntrack'
 
     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'
@@ -88,7 +81,7 @@
 
     project: 'netvirt'
     stream: 'fluorine'
-    branch: 'master'
+    branch: 'stable/fluorine'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -149,13 +142,6 @@
           odl-snat-mode: 'conntrack'
 
     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'
@@ -231,13 +217,6 @@
           odl-snat-mode: 'conntrack'
 
     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'
@@ -253,7 +232,7 @@
     project: 'netvirt'
     security-group-mode: 'stateful'
     odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-2
+    openstack_system2_flavor: odl-highcpu-8
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -272,12 +251,6 @@
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
     openstack:
       - queens:
           openstack-branch: 'stable/queens'
@@ -286,14 +259,27 @@
           openstack_system_image: '{openstack_system_image_queens}'
           openstack_system2_image: '{openstack_system_image_queens}'
 
+    stream:
+      - neon:
+          branch: 'master'
+          ovs-install: 'v2.9.2'
+      - fluorine:
+          branch: 'stable/fluorine'
+          ovs-install: 'v2.9.2'
+      - oxygen:
+          branch: 'stable/oxygen'
+          ovs-install: 'v2.6.1-nsh'
+          os-cmp-cnt: 1
+          openstack_system2_count: 1
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-fluorine
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
       - inttest-csit-openstack
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'n-cpu,placement-api,tempest'
@@ -304,6 +290,14 @@
     os-ctl-cnt: 0
     os-cmp-cnt: 0
 
+    stream:
+      - neon:
+          branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+
     topology:
       - 1node:
           openstack_system2_count: 0
@@ -352,13 +346,6 @@
           odl-snat-mode: 'conntrack'
 
     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'