Refactor netvirt job params to use default values

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 60130c426cb13880f376df44ffd62a1f1e23c14f..682a5836b9b077bcbb7c0ffefd09338afc27d8e1 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -60,12 +60,10 @@
       - mitaka:
           openstack-branch: 'stable/mitaka'
           odl-ml2-branch: 'stable/mitaka'
-          odl-ml2-driver-version: 'v1'
           openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v1'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
@@ -77,22 +75,10 @@
 
     tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
 
-    odl-enable-l3: 'yes'
-
     enable-networking-l2gw: 'yes'
 
     disable-odl-l3-service-plugin: 'yes'
 
-    public-bridge: 'br-physnet1'
-
-    public-physical-network: 'physnet1'
-
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
 
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-
-    tenant-network-type: 'vxlan'
-
     security-group-mode: '{sg-mode}'
-
-    robot-options: ''