Merge "Add a note regarding deploy maven jobs"

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

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 1c7d2777dd4aaaba9f2e8cb676f3551729d47e50..e25f66ebaa8427b2bb73546e5dd0500f9c82939e 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -20,15 +23,25 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
+            odl-ml2-version:  'stable/mitaka'
+        - newton:
+            openstack-branch: 'stable/newton'
             odl-ml2-version:  'master'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
 
     openstack-vms: 3
 
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     schedule: 'H H * * *'
 
     odl-enable-l3: 'yes'
+
+    public-bridge: 'br-ex'
+
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
+
+    tenant-network-type: 'vxlan'
+
+    security-group-mode: 'none'