Add bier project to Jenkins

[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 768b19629dd051ce71d12adf25200e9159b83b5a..7e69857cffd1c365c1c554b8c4f86dd1756cbe2f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -30,10 +30,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: 4
 
@@ -43,7 +49,7 @@
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+    public-bridge: 'br-physnet1'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'