Merge "Add a new job for TSDR elasticSearch"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 8f68f5ee847d5d0810bd3b603449221d1d1bf1c6..534cf14690280bcb6558984ad7f02c6944e3559f 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -1,3 +1,4 @@
+---
 # ODL Releng jenkins defaults
 
 - defaults:
@@ -11,12 +12,14 @@
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
+    networking-l2gw-repo: 'http://git.openstack.org/openstack/networking-l2gw'
     server-name: 'OpenDaylight'
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     branch: master
+    distribution_branch: '$GERRIT_BRANCH'
 
     # Distribution bundle URL
     bundleurl: 'last'
@@ -31,7 +34,7 @@
     odl_system_image: CentOS 7 - java-builder - 20170126-0058
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170210-1356
+    openstack_system_image: CentOS 7 - devstack - 20170221-1719
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
     tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
@@ -110,7 +113,7 @@
     10-inclusion-flag: 'off'
     10-exclude-value: ''
 
-    ### CSIT Test List Variables
+    # CSIT Test List Variables
     # Space seperated strings to exclude from CSIT lists
     csit-list-blacklist: 'longevity gate'
     # Auto Generated CSIT job lists used