X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcoretutorials%2Fcoretutorials.yaml;h=67d5754d2698c520eb808ef75ee1173b0afd98d4;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=19fa1e364766246976d186dbbff6a09c823d7cd0;hpb=f348f1c730ed9939f7b5059ac5a29b2e82036456;p=releng%2Fbuilder.git

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 19fa1e364..67d5754d2 100644
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,26 +1,36 @@
 ---
+- project:
+    name: coretutorials-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    mvn-settings: 'coretutorials-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    build-timeout: 120
+
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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
@@ -28,25 +38,17 @@
 - project:
     name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
     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
@@ -54,26 +56,18 @@
 - project:
     name: coretutorials-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/carbon'
     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 +75,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