Merge "Fix packaging tox-verify to run only master"

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 5a300fe311f5dabcab5c4f197f72b86d3933edaf..ae09f245f37c302bc9b671ee58ef95fc3154f17c 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -3,8 +3,7 @@
     name: coretutorials-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     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
@@ -29,8 +29,7 @@
     name: coretutorials-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     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
@@ -55,8 +55,7 @@
     name: coretutorials-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     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
@@ -89,3 +89,4 @@
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 120