Add OpenStack Ocata runs for netvirt

[releng/builder.git] / jjb / netvirt / netvirt-csit-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 452244ef3f3f7cae7f0280621f21ba7210b7b1ef..4e1ba2f688a4f4ae2ff9a96e30e6b2aadc1dd82d 100644 (file)
--- 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/4 * * *'
+          schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: 'H H * * *'
+          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,46 +53,70 @@
           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'
-          odl-ml2-driver-version: 'v1'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v1'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
+          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 - 20170210-1344'
-
-    odl-enable-l3: 'yes'
-
-    public-bridge: 'br-physnet1'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
-    public-physical-network: 'physnet1'
+    security-group-mode: '{sg-mode}'
 
-    enable-networking-l2gw: 'no'
+- project:
+    name: netvirt-csit-extensions-site-openstack-integration
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
-    disable-odl-l3-service-plugin: 'no'
+    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'