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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 963cffe96b03084e4ed167562e86b9d986e1188b..9d4dc33bc68f01d27924102e651811bb7f5db56a 100644 (file)
--- 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 7b1ef343382a62fae6370c7ba1fb735914509b98..a54b7b97e8fb66fa74bdd982bab20819f04edd43 100644 (file)
--- 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'