X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdidm%2Fdidm.yaml;h=c2249a2894651b1f2a5c7e585c84a378982a765b;hb=63ecbdec7e9b945d75d5a4476571dba63a832590;hp=cabdfe8da449ee2ce59f1d59e1b6fe69a2809d54;hpb=2560c7522b16c32b6057426d3b794452e0cccd1a;p=releng%2Fbuilder.git

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index cabdfe8da..c2249a289 100644
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,18 +1,15 @@
 ---
 - project:
-    name: didm-nitrogen
+    name: didm-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: nitrogen
+    stream: oxygen
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,21 +22,20 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
-    name: didm-carbon
+    name: didm-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: carbon
+    stream: nitrogen
     project: 'didm'
     project-name: 'didm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -52,21 +48,21 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
-    name: didm-boron
+    name: didm-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: boron
+    stream: carbon
     project: 'didm'
     project-name: 'didm'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -79,10 +75,13 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
     name: didm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'didm'
     project-name: 'didm'
     branch: 'master'