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=e8d66d20f6778efe2ca4860f3851954016dae797;hpb=ebf4bc5604d4a055be55c142f12bbfbd1f6b8a07;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index e8d66d20f..23c4a80fb 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,87 +1,117 @@
+---
 - project:
     name: netvirt-csit-openstack-integration
     jobs:
-        - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
 
     topology:
-        - 1node:
-            openstack_system_count: 3
-            odl_system_count: 1
-            enable-haproxy: 'no'
-            install-features: 'odl-netvirt-openstack'
-        - 3node:
-            openstack_system_count: 4
-            odl_system_count: 3
-            enable-haproxy: 'yes'
-            install-features: 'odl-jolokia,odl-netvirt-openstack'
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-        - upstream-transparent:
-            schedule: 'H H/4 * * *'
-            sg-mode: 'transparent'
-        - upstream-stateful:
-            schedule: 'H H * * *'
-            sg-mode: 'stateful'
-        - upstream-learn:
-            schedule: 'H H * * *'
-            sg-mode: 'learn'
-        - gate-learn:
-            schedule: ''
-            sg-mode: 'learn'
-        - gate-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-        - gate-stateful:
-            schedule: ''
-            sg-mode: 'stateful'
-        - gate-minimal-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-            testplan: '{project}-{topology}-minimal-openstack.txt'
-        - gate-tempest-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-            testplan: '{project}-{topology}-tempest-openstack.txt'
+      - upstream-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - upstream-learn:
+          schedule: ''
+          sg-mode: 'learn'
+      - gate-learn:
+          schedule: ''
+          sg-mode: 'learn'
+      - gate-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+      - gate-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - gate-minimal-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      - gate-tempest-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+          testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - 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'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170130-0523'
-        - newton:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
-        - newton-nodl-v2:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
-    odl-enable-l3: 'yes'
+    security-group-mode: '{sg-mode}'
 
-    public-bridge: 'br-physnet1'
+- project:
+    name: netvirt-csit-extensions-site-openstack-integration
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    topology:
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-sfc'
 
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
+    functionality:
+      - extensions-sfc:
+          schedule: ''
+          enable-openstack-plugins: 'networking-odl,networking-sfc'
+          testplan: '{project}-extensions-sfc.txt'
 
-    tenant-network-type: 'vxlan'
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
-    security-group-mode: '{sg-mode}'
+    openstack:
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
-    robot-options: ''
+    security-group-mode: 'stateful'