Remove nitrogen branches in projects

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

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index ea1f621abcc506ed22dc478e823f000da784695b..ca443e740106afd1c9b7267dc4e69f763684f0aa 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: atrium-oxygen
+    name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
@@ -19,36 +17,15 @@
     staging-profile-id: 9324f12310e6a
 
 - project:
-    name: atrium-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
-- project:
-    name: atrium-carbon
+    name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''