Code Review / releng / builder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 29cf4ad)
jenkins job networking odl v2 71/46871/11
authortalr <tal.rosenzweig@hpe.com>
Mon, 26 Sep 2016 15:09:35 +0000 (18:09 +0300)
committerTal Rosenzweig <tal.rosenzweig@hpe.com>
Sun, 6 Nov 2016 16:39:44 +0000 (18:39 +0200)
Change-Id: I390b2a7f4acd411ce87ed675f53631ed5936a24b
Signed-off-by: talr <tal.rosenzweig@hpe.com>
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml patch | blob | history
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh patch | blob | history
jjb/integration/integration-templates.yaml patch | blob | history
jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml patch | blob | history
jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml patch | blob | history
jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml patch | blob | history
jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml patch | blob | history
jjb/vtn/vtn-manager-csit-1node-openstack.yaml patch | blob | history

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index e0d300e249cfeba904db7e1681fa9b7f8e5f898c..6b4965bc9088103cdd205ebf92b675bf85bcabc2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -26,10 +26,12 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
         - liberty:
             openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+            odl-ml2-branch: 'stable/liberty'
+            odl-ml2-driver-version: 'v1'
 
     openstack-vms: 1
 
@@ -45,4 +47,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'
diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index b8e0f6998f155f68c01699c05359bb997cb904f7..cf360572480d9e412a62d07435fb169b49b6d648 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -58,13 +58,16 @@ SERVICE_TOKEN=service
 SERVICE_PASSWORD=admin
 ADMIN_PASSWORD=admin
 
-enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION}
+enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
 
 ODL_PORT=8080
 ODL_MODE=externalodl
 LIBVIRT_TYPE=qemu
 
 EOF
+if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
+    echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
+fi
 
 if [ "${NUM_ODL_SYSTEM}" -gt 1 ]; then
 odl_list=${ODL_SYSTEM_1_IP}
@@ -109,9 +112,6 @@ disable_service q-l3
 Q_L3_ENABLED=True
 ODL_L3=${ODL_L3}
 PUBLIC_INTERFACE=br100
-[[post-config|\$NEUTRON_CONF]]
-[DEFAULT]
-service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
 
 EOF
 fi
@@ -169,7 +169,7 @@ SERVICE_TOKEN=service
 SERVICE_PASSWORD=admin
 ADMIN_PASSWORD=admin
 
-enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION}
+enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
 ODL_MODE=compute
 LIBVIRT_TYPE=qemu
 
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 63a9537d09d70b9301b2b8b67802ab9913c01793..a516a988107e8c7178b2335f469ff0d110e840bb 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -798,9 +798,13 @@
             default: 'https://github.com/openstack/networking-odl'
             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}'
@@ -912,9 +916,13 @@
             default: 'https://github.com/openstack/networking-odl'
             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}'
diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 1cfa363ab1a73450f71d73d32ad36d41fcdf9a6f..e8e04391b1e1f8cc4ef78f57cc770ba9fe7d059b 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-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: 'master'
+            odl-ml2-driver-version: 'v1'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v2'
 
     openstack-vms: 3
 
diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 768b19629dd051ce71d12adf25200e9159b83b5a..7784bff3b6e854e31f6f7dd85c4c13952ab4c1df 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: 'master'
+            odl-ml2-driver-version: 'v1'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v2'
 
     openstack-vms: 4
 
diff --git a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index 7a1cac1e004b7b6756d2324a1484d67776a8012a..78a17a42494657925f3b68c85c8177e23565ad7d 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: 'master'
+            odl-ml2-driver-version: 'v1'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v2'
 
     openstack-vms: 3
 
diff --git a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index 8194d134b81659ab60cc881172a9b3f32edd5a41..b06acf58ab23be13263af01516d3d519543fa725 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-3node-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: 'master'
+            odl-ml2-driver-version: 'v1'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v2'
 
     openstack-vms: 4
 
diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 8716066fada69a8ecc9a38b43a316bc2cd4e45a0..55d321acd643a8d76fd547ac4e7650ba35b84ad4 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -23,10 +23,12 @@
     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: 'master'
+            odl-ml2-driver-version: 'v1'
 
     openstack-vms: 1
 
Release Engineering Build infrastructure (Jenkins Job Builder, Packer, etc)