X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdidm%2Fdidm.yaml;h=30fd8f6d5108b3a7227cbc2ab00adaabeaeb9837;hb=bac2762e11d9541ad171cd6867a40a06da25041b;hp=b3b7910e3cfb9e43ebad694008c829744181d27a;hpb=f348f1c730ed9939f7b5059ac5a29b2e82036456;p=releng%2Fbuilder.git

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index b3b7910e3..30fd8f6d5 100644
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,82 +1,53 @@
 ---
 - project:
-    name: didm-oxygen
+    name: didm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
 
 - project:
-    name: didm-nitrogen
+    name: didm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'didm'
     project-name: 'didm'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
 
 - project:
-    name: didm-carbon
+    name: didm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'didm'
     project-name: 'didm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
@@ -84,10 +55,9 @@
 - project:
     name: didm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'