X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=02c805a84d6afe2b5154a2430776e4e2f1c19ca9;hb=905bb63d56dd2defd3b8ab51041b990cc72424b2;hp=b69e962ace437ee233fa1445a6256c19eef1a710;hpb=7ac7dcc6837f72ff932a576ae9b314bd6fa71fb1;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index b69e962ac..02c805a84 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -128,7 +128,8 @@
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    disabled: false
+    disable-job: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: centos7-robot-2c-8g
@@ -828,7 +829,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
     id: inttest-csit-hwvtep-openstack
     disabled: false
 
@@ -914,10 +916,6 @@
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
           default: '{devstack-networking-sfc-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
-      - string:
-          name: ODL_ENABLE_L3_FWD
-          default: '{odl-enable-l3}'
-          description: 'Enable L3 FWD in ODL for createing br-ex'
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
           default: '{ipsec-vxlan-tunnels-enabled}'
@@ -1132,10 +1130,6 @@
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
           default: '{devstack-networking-sfc-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
-      - string:
-          name: ODL_ENABLE_L3_FWD
-          default: '{odl-enable-l3}'
-          description: 'Enable L3 FWD in ODL for createing br-ex'
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
           default: '{ipsec-vxlan-tunnels-enabled}'
@@ -1201,10 +1195,6 @@
           default: '{lbaas-service-provider}'
           description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
           neutron-lbaas'
-      - string:
-          name: NUM_OPENSTACK_SITES
-          default: '{num-openstack-sites}'
-          description: 'Number of openstack sites'
       - string:
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'