Merge "Remove alto carbon jobs"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 5892334b09941f9f91e05fdfbbd367d95adfc6fd..998c03f21a40031358013041a9019b07897a6d97 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: of-config-oxygen
+    name: of-config-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
@@ -18,15 +17,15 @@
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-nitrogen
+    name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
@@ -36,16 +35,15 @@
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-carbon
+    name: of-config-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'