Merge "Enable javadoc jobs for neutron"

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 6f3cc1e15f63ae959211c29318f108273228d085..19fa1e364766246976d186dbbff6a09c823d7cd0 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,17 +1,15 @@
 ---
 - project:
-    name: coretutorials-carbon
+    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: carbon
+    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-boron
+    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: boron
+    stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -49,21 +48,23 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # 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}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
+      - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
@@ -74,6 +75,9 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-sonar
     jobs: