X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fiotdm%2Fiotdm.yaml;h=6a2589070424896f3d512e0855056781ade7f12b;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=30ecd8b5528d5a104b28bf21fa373a338d8b96ea;hpb=89f3dafca52af8a99ed565abf4b5e4cdd64c788f;p=releng%2Fbuilder.git

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 30ecd8b55..6a2589070 100644
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,82 +1,55 @@
 ---
 - project:
-    name: iotdm-oxygen
+    name: iotdm-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: neon
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     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-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/fluorine'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     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-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     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
@@ -84,10 +57,16 @@
 - project:
     name: iotdm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: iotdm
+    description: 'List of iotdm jobs'
+    regex: '^iotdm-.*'
+    <<: *releng_view_common