Merge "Clean up and rename OF CSIT jobs"

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 11aa8359b59b2ebc363ca71b423f8b080d6f8cb1..1d3ecda88580deef2cef465926b91a8b85b1d703 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,18 +1,18 @@
 ---
 - project:
-    name: sfc-nitrogen
+    name: sfc-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,7 +26,7 @@
     archive-artifacts: ''
 
 - project:
-    name: sfc-carbon
+    name: sfc-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -34,12 +34,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,7 +51,7 @@
     archive-artifacts: ''
 
 - project:
-    name: sfc-boron
+    name: sfc-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -61,12 +59,11 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: