Merge "Update JJB version 2.0.5"

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

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 6f4d780c84cc0c26a59656e842d6e8978024a8ee..3a29a05cafa30e88b667f458a1f1dedbb20f3346 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,15 +1,32 @@
 ---
+- project:
+    name: iotdm-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'iotdm-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'master'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -23,7 +40,6 @@
     name: iotdm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +59,6 @@
     name: iotdm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon