X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fiotdm%2Fiotdm.yaml;h=3138be8365f0a4008826d608dd7522f30bae757f;hb=63ecbdec7e9b945d75d5a4476571dba63a832590;hp=7af120d48b7f93f71ee301aabc5d1a02f6501275;hpb=9b46087a28de418cf2e0ce5d366346dc9adc3a10;p=releng%2Fbuilder.git

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 7af120d48..3138be836 100644
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -2,17 +2,14 @@
 - project:
     name: iotdm-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
     stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +22,20 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
     stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +48,21 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
     stream: carbon
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,10 +75,13 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'