X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=2f85e163c4b84682d2ff8ecdfcff248cacf62a34;hb=12847e3e15f9130fb7c6c3f9fa6e929cde3fcfaa;hp=549cb0ccbad478da383ed9400d257db7fa839b77;hpb=7bccdd823b714cc2834687af9b13b29a26847ee1;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 549cb0ccb..2f85e163c 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,12 +3,22 @@
 
 - defaults:
     name: global
+    functionality: global
+    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
+    scriptplan: '{project}.txt'
+    configplan: '{project}.txt'
+    testplan: '{project}-{functionality}.txt'
+    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
 
+    # File triggers
+    files: '**'
+    forbidden-files: ''
+
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-builder-4c-4g
@@ -26,7 +36,7 @@
     devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
 
     # lf-infra defaults
-    jenkins-ssh-credential: opendaylight-jenkins-ssh
+    jenkins-ssh-credential: jenkins-ssh
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
@@ -49,7 +59,6 @@
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1
-    odl-enable-l3: 'yes'
     odl-ml2-driver-version: 'v1'
     odl-ml2-port-binding: 'network-topology'
     public-bridge: 'br-physnet1'
@@ -58,7 +67,12 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
+    os-std-topo: '0cmb-1ctl-2cmp'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -74,7 +88,7 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
+    openstack_system_image_queens: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
@@ -82,7 +96,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180611-1830
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180723-235310.638
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
@@ -187,9 +201,9 @@
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-high-frequency-list-fluorine: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine