Fix Gerrit project path for meta projects

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

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 2061221d2a5c0adf4eda9bdac1cb58a7c5fe9404..bae96fa14e42933e6b5e23ed37424ecf5e0420d5 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:
@@ -59,7 +59,7 @@
     publishers:
         ARCHIVE_ARTIFACTS
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - maven-deploy:
             id: ''
             unique-version: true