Remove nitrogen branches in projects

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index fbd47780c894731805a66dc77c61d746601ecd06..7c799b44a7a0b22daa45a348e54307dc0a7fc4b0 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: dlux-oxygen
+    name: dlux-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
@@ -14,48 +12,24 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-carbon
+    name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f