Merge "Migrate faas matrix-verify jobs to freestyle-verify jobs"

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

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 994d4c1a07ff2c5b8a9e3754ad7981facc676df5..92f393df99517e1db793b7286d767e2489e2667d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -16,24 +16,27 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'master'
+            odl-ml2-version:  'stable/mitaka'
         - liberty:
             openstack-branch: 'stable/liberty'
             odl-ml2-version:  'stable/liberty'
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack,odl-jolokia'
+    install-features: 'odl-ovsdb-openstack'
 
     schedule: 'H H * * *'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
+
+    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'