X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fiotdm%2Fiotdm.yaml;h=00d7b9769f4d00fa45e56533f60f8d34d006d26e;hb=fac7e6626c54211226c202814d8daa123f5cbde0;hp=4da8aef60bf257ad7f9be2017abab5856c21507e;hpb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;p=releng%2Fbuilder.git

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 4da8aef60..00d7b9769 100644
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,67 +1,56 @@
 ---
 - project:
-    name: iotdm-oxygen
+    name: iotdm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
-    jdks:
-      - openjdk8
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
 
 - project:
-    name: iotdm-nitrogen
+    name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
 
 - project:
-    name: iotdm-carbon
+    name: iotdm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
@@ -73,5 +62,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'