Add a prefix variable to defaults as blank

[releng/builder.git] / jjb / coretutorials / coretutorials.yaml

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 19fa1e364766246976d186dbbff6a09c823d7cd0..e392ba515ab8148785e4d9c921401ef7f4751c05 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'coretutorials'
@@ -21,6 +20,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -30,7 +30,6 @@
     jobs:
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'coretutorials'
@@ -47,6 +46,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -56,7 +56,6 @@
     jobs:
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'coretutorials'
@@ -74,6 +73,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -81,7 +81,7 @@
 - project:
     name: coretutorials-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'coretutorials'
     project-name: 'coretutorials'
@@ -89,3 +89,5 @@
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 120
+