X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdidm%2Fdidm.yaml;h=cabdfe8da449ee2ce59f1d59e1b6fe69a2809d54;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=e0eb6405543fd4954427192e49869d0987cbd2ee;hpb=ff67d8c3a444e385d0092f8c6458b92b26f58af9;p=releng%2Fbuilder.git

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index e0eb64055..ff620ae1f 100644
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,93 +1,45 @@
 ---
 - project:
-    name: didm-carbon
+    name: didm-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: fluorine
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
-    jdk: openjdk8
-    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: ''
-
-- project:
-    name: didm-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    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-beryllium
+    name: didm-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: oxygen
     project: 'didm'
     project-name: 'didm'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - 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-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'