X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcoretutorials%2Fcoretutorials.yaml;h=8ffa7a99d1c3d23db23e0e0f4d3de906f7a2931b;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=6f3cc1e15f63ae959211c29318f108273228d085;hpb=5e174f5369c8d24a081f37f8ea227c1fff8ebb0e;p=releng%2Fbuilder.git

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 6f3cc1e15..8ffa7a99d 100644
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,87 +1,67 @@
 ---
 - project:
-    name: coretutorials-carbon
+    name: coretutorials-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
-    jdk: openjdk8
-    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
 
 - project:
-    name: coretutorials-boron
+    name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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
 
 - project:
-    name: coretutorials-beryllium
+    name: coretutorials-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     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
 
 - 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