Remove unused {maven} variable

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 19fa1e364766246976d186dbbff6a09c823d7cd0..9077a7882cf6e6f06c2fdf7fbccd310e0420c51a 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'
@@ -12,15 +11,12 @@
     branch: 'master'
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -29,8 +25,7 @@
     name: coretutorials-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'coretutorials'
@@ -38,15 +33,12 @@
     branch: 'stable/nitrogen'
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -55,8 +47,7 @@
     name: coretutorials-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'coretutorials'
@@ -65,15 +56,12 @@
     karaf-version: karaf3
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -81,11 +69,11 @@
 - project:
     name: coretutorials-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: master
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 120