Merge "jenkins job networking odl v2"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 10a7e6d02cc79dd13a9dbb51e8ac2ea2f3e8e072..c48a183770805b50b75116eef693c44b9f6d1dd4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1006,9 +1006,13 @@
             default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
-            name: ODL_ML2_VERSION
-            default: '{odl-ml2-version}'
+            name: ODL_ML2_BRANCH
+            default: '{odl-ml2-branch}'
             description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ML2_DRIVER_VERSION
+            default: '{odl-ml2-driver-version}'
+            description: 'Mode of networking-odl (v1 or v2)'
         - string:
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
@@ -1120,9 +1124,13 @@
             default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
-            name: ODL_ML2_VERSION
-            default: '{odl-ml2-version}'
+            name: ODL_ML2_BRANCH
+            default: '{odl-ml2-branch}'
             description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ML2_DRIVER_VERSION
+            default: '{odl-ml2-driver-version}'
+            description: 'Mode of networking-odl (v1 or v2)'
         - string:
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'