X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdidm%2Fdidm.yaml;h=f5666bc3a658fcd74250ba329f774a1b9d4a40fa;hb=909d01215f4ec193d3552d823147f978a2c851ef;hp=de5eedd809917a74b286767118d61df265c3b2d9;hpb=a214d88a9c46b5647f624ff6b3ef60d03d16567a;p=releng%2Fbuilder.git

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index de5eedd80..f5666bc3a 100644
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,48 +1,92 @@
-# ODL Releng build templates
 - project:
-    name: didm
+    name: didm-carbon
+    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: carbon
+    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-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{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: ''
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: True
+- project:
+    name: didm-beryllium
+    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: beryllium
     project: 'didm'
     project-name: 'didm'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
     archive-artifacts: ''
+
+- project:
+    name: didm-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    mvn-settings: 'didm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'