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 5a0261356ff0cd5341eeb26e5cb29ebcd0d78d97..92f393df99517e1db793b7286d767e2489e2667d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -27,7 +27,7 @@
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack,odl-jolokia'
+    install-features: 'odl-ovsdb-openstack'
 
     schedule: 'H H * * *'
 
@@ -37,6 +37,6 @@
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn'
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'