Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 447d851608348231e9a0fed150fc77fdeeb2b4b7..774cb25760ac6d8e4944dcc6fece52b1a14fcb62 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: atrium-oxygen
+    name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
@@ -18,15 +17,15 @@
     staging-profile-id: 9324f12310e6a
 
 - project:
-    name: atrium-nitrogen
+    name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -36,16 +35,15 @@
     staging-profile-id: 9324f12310e6a
 
 - project:
-    name: atrium-carbon
+    name: atrium-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''