X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution.yaml;h=c737d8d70d79b2bec5e4aedceb64dddec1ad88d6;hb=c792dd0bbcd7293ac7097d12a5170e7f69369a68;hp=ec32f448579ab64d1c6ae2235f2142dec031d3cd;hpb=5792033ab1af50b01365f8dbed40309a98a294cb;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index ec32f4485..c737d8d70 100644
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,36 +1,43 @@
 ---
-# ODL Releng build templates
 - project:
     name: distribution
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
-      - '{project-name}-validate-autorelease-{stream}'
-      - distribution-check-{stream}
+      # gerrit- is generic template, distribution- is project specific.
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-deploy-{stream}'
+      - 'distribution-offline-{stream}'
+      - 'distribution-check-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
+
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[int/dist]'
 
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-            - openjdk7
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'