From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Mon, 25 Apr 2016 15:40:54 +0000 (+0000)
Subject: Merge "Added lines to local.conf for Metadata configuration"
X-Git-Tag: release/beryllium-sr2~27
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=21214140ee0d724e1953e23de60eab04ccbd127d;hp=d2298c706207323ed74d211ef6f3999692527612;p=releng%2Fbuilder.git

Merge "Added lines to local.conf for Metadata configuration"
---

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 963cffe96..9d4dc33bc 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -689,7 +689,7 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
@@ -778,7 +778,7 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
@@ -872,4 +872,4 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 7b1ef3433..a54b7b97e 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -45,6 +45,7 @@
     integration-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
     integration-distribution-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
     iotdm-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418228763195'
+    jsonrpc-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1461352069244'
     kafkaproducer-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1452526644682'
     l2switch-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694505032'
     lacp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418417438677'