Merge "Add .editorconfig"

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

diff --git a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index 7a1cac1e004b7b6756d2324a1484d67776a8012a..5721a00f150b2465aa405599d81da08570b22ce6 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
@@ -27,10 +27,16 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
         - newton:
             openstack-branch: 'stable/newton'
-            odl-ml2-version:  'master'
+            odl-ml2-branch: 'stable/newton'
+            odl-ml2-driver-version: 'v1'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'stable/newton'
+            odl-ml2-driver-version: 'v2'
 
     openstack-vms: 3
 
@@ -47,3 +53,5 @@
     tenant-network-type: 'vxlan'
 
     security-group-mode: 'none'
+
+    robot-options: ''