Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index d36e97ec238cbb0ba58d3d2bcce1bf68d3c599a3..31d0eba08fd4d7311cdf420e3d2e278f425d054a 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -1,12 +1,11 @@
 ---
 - project:
-    name: eman-oxygen
+    name: eman-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
@@ -20,16 +19,16 @@
     staging-profile-id: 96e9352979521
 
 - project:
-    name: eman-nitrogen
+    name: eman-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'eman'
     project-name: 'eman'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -40,17 +39,16 @@
     staging-profile-id: 96e9352979521
 
 - project:
-    name: eman-carbon
+    name: eman-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'eman'
     project-name: 'eman'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''