Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 1358a5e88d4f39de6fc2160589c00f900db9ca6a..2cfe449b6f4d7345e1e08580735f5489e560e070 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: yangide-oxygen
+    name: yangide-fluorine
     jobs:
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
@@ -17,14 +17,14 @@
     staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-nitrogen
+    name: yangide-oxygen
     jobs:
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'yangide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
@@ -34,15 +34,14 @@
     staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-carbon
+    name: yangide-nitrogen
     jobs:
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'yangide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'