X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution.yaml;h=53d72fc8b9caf37880af39291ee140524dda0f57;hb=d2728da8c27b3fa350c24308ff364f2a469596c7;hp=100acd9e936653208a22c57a87057deb9e3c1488;hpb=dae67a1f93f7ebe956750d65c10ae9e881c3e10d;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 100acd9e9..53d72fc8b 100644
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,40 +1,41 @@
+---
 # ODL Releng build templates
 - project:
     name: distribution
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-sonar'
-        - '{project-name}-validate-autorelease-{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-tox-verify
 
-    stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
-            disable_autorelease: False
-            disable_distribution_check: False
-
-    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
+
+- 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'