Merge "Update Ubuntu 14.04 image"

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index dfd6205f1cfdd52d8992845cab6686dc035290bb..78b683e7158f426724091dba686929fe0646f9bb 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: coretutorials-oxygen
+    name: coretutorials-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
@@ -13,48 +12,42 @@
     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-nitrogen
+    name: coretutorials-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'coretutorials-settings'
     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-carbon
+    name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'coretutorials-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
     build-timeout: 120
 
     # Used by the release job