X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fiotdm%2Fiotdm.yaml;h=fd58902819db0203602a16f910e6e54b55f07335;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=ed5b2d0aacee537127549ac1ef4c90249ed843a0;hpb=4dd0f93bdcc602f444719a3b5c95a5447866af85;p=releng%2Fbuilder.git

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index ed5b2d0aac..fd58902819 100644
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: iotdm-oxygen
+    name: iotdm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
@@ -19,36 +18,16 @@
     staging-profile-id: 96fd6e9453970
 
 - project:
-    name: iotdm-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/carbon'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'