X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution.yaml;h=377a9d17588416924ebe0277a26c7caffa88fa36;hb=66c2bf6fbbbd4049cb106c1d122b4af632c32328;hp=deed0abec2cf7cbaa1a75fbd3598aded1fab9abd;hpb=e5ebb1faf1e71657113c709ef811a25242780862;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index deed0abec..377a9d175 100644
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,34 +1,31 @@
+---
 # ODL Releng build templates
 - project:
     name: distribution
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-sonar'
-        - '{project-name}-validate-autorelease-{stream}'
+      # {project-name}- is generic template, distribution- is project specific.
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-sonar'
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-deploy-{stream}'
+      - 'distribution-offline-{stream}'
+      - 'distribution-check-{stream}'
+      - gerrit-tox-verify
 
-    stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
-
-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-settings: 'integration-distribution-settings'
+    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: 'odlparent-merge-{stream}'
+    dependencies: ''
     email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'
+
+    stream:
+      - oxygen:
+          branch: master
+      - nitrogen:
+          branch: stable/nitrogen
+      - carbon:
+          branch: stable/carbon
+          karaf-version: karaf3