Merge "Remove alto carbon jobs"

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 8ebb6299014f62855c9c3d34e6697d0f107d0721..0390cc3a0eb3d2e239589e54ca72a2535edbf67c 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: infrautils-oxygen
+    name: infrautils-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
@@ -19,15 +19,16 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-nitrogen
+    name: infrautils-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -37,16 +38,15 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-carbon
+    name: infrautils-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'