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 b45507557b2e7fbb8f66bafc92c82592abd15a72..4e1ba2f688a4f4ae2ff9a96e30e6b2aadc1dd82d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -27,6 +27,10 @@
       - upstream-stateful:
           schedule: ''
           sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - upstream-learn:
           schedule: ''
           sg-mode: 'learn'
@@ -55,15 +59,13 @@
       - 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'
@@ -73,52 +75,9 @@
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
-
-    security-group-mode: '{sg-mode}'
-
-- project:
-    name: netvirt-csit-multi-site-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'netvirt'
-
-    topology:
-      - 2site-1node:
-          openstack_system_count: 6
-          odl_system_count: 2
-          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'
-
-    functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-
-    stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-
-    openstack:
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
@@ -136,7 +95,7 @@
           openstack_system_count: 3
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          install-features: 'odl-netvirt-sfc'
 
     functionality:
       - extensions-sfc:
@@ -145,9 +104,13 @@
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
       - newton-nodl-v2: