X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcoretutorials%2Fcoretutorials.yaml;h=5a300fe311f5dabcab5c4f197f72b86d3933edaf;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=09860abbf8910e09248db122d06df855ceecf3ce;hpb=b44aaa0cfbb05c8250c06d9dac16085f1e9ac732;p=releng%2Fbuilder.git

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 09860abbf..5a300fe31 100644
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,17 +1,15 @@
 ---
 - project:
-    name: coretutorials-nitrogen
+    name: coretutorials-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,19 +22,20 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
-    name: coretutorials-carbon
+    name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/carbon'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -49,19 +48,21 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
-    name: coretutorials-boron
+    name: coretutorials-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
       - openjdk8
     maven:
@@ -74,35 +75,13 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
-- project:
-    name: coretutorials-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    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: ''
+    # 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'