Merge "Add provide-maven-settings prebuilder to all templates"

[releng/builder.git] / jjb-templates / merge.yaml

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index fe3f190f53b7c76917a91c6b37e4e96050caccc2..39dc2d68d8ef7238f4e6e517dc2f72a96aef40b2 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-merge-{stream}'
+    name: 'PROJECT_SHORTNAME-merge-{stream}'
 
     # Job template for ODL merge jobs
     #
@@ -38,7 +38,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
             branch: '{branch}'
 
     prebuilders:
@@ -62,7 +62,7 @@
     publishers:
         ARCHIVE_ARTIFACTS
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - maven-deploy:
             id: ''
             unique-version: true