removing netconf connector from netconf scale suite for carbon

[releng/builder.git] / jjb / vtn / vtn-manager-csit-1node-openstack.yaml

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 8f0409884635720521d03cee2e18af514a07d735..55d321acd643a8d76fd547ac4e7650ba35b84ad4 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'neutron'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -20,10 +23,12 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v1'
 
     openstack-vms: 1
 
@@ -40,3 +45,5 @@
     disable-openstack-services: 'n-net,q-l3'
 
     tenant-network-type: 'local'
+
+    security-group-mode: 'none'