Merge "Remove dlux carbon jobs"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 99d4478be53beef4531e89dc5253db9f27c17b0e..e878163c46131ad9719990d7ab6058d4e3930bff 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'
@@ -19,16 +17,15 @@
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-nitrogen
+    name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -38,17 +35,15 @@
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-carbon
+    name: dlux-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'