X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=23c4a80fb0e8bfc509022e95bddffed5b2bd0513;hb=3473052865402b842ead38173b1369f08b66b05d;hp=cac427f4071c4dc989f2d97c3bed4fe78c214c53;hpb=b60001fddbfd16c822f9eb92672e52433ebf8337;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index cac427f40..23c4a80fb 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -22,13 +22,17 @@
 
     functionality:
       - upstream-transparent:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: 'H H/4 * * *'
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
           sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - upstream-learn:
-          schedule: 'H H * * *'
+          schedule: ''
           sg-mode: 'learn'
       - gate-learn:
           schedule: ''
@@ -49,18 +53,19 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
@@ -74,43 +79,33 @@
     security-group-mode: '{sg-mode}'
 
 - project:
-    name: netvirt-csit-multi-site-openstack-integration
+    name: netvirt-csit-extensions-site-openstack-integration
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
 
     topology:
-      - 2site-1node:
-          openstack_system_count: 6
-          odl_system_count: 2
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,odl-netvirt-federation'
-          num-openstack-sites: 2
-      - 2site-3node:
-          openstack_system_count: 8
-          odl_system_count: 6
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,odl-netvirt-federation'
-          num-openstack-sites: 2
-
-    testplan: '{project}-{topology}-openstack.txt'
+          install-features: 'odl-netvirt-sfc'
 
     functionality:
-      - upstream-stateful:
-          schedule: 'H H * * *'
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: 'H H * * *'
-          sg-mode: 'learn'
+      - extensions-sfc:
+          schedule: ''
+          enable-openstack-plugins: 'networking-odl,networking-sfc'
+          testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
+      - carbon:
+          branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
       - newton-nodl-v2:
@@ -119,4 +114,4 @@
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
-    security-group-mode: '{sg-mode}'
+    security-group-mode: 'stateful'