Merge "Update branch cutting script"

[releng/builder.git] / jjb / integration / distribution / distribution.yaml

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index fbad4140664a4211e6079d2625d5557f176ab042..c737d8d70d79b2bec5e4aedceb64dddec1ad88d6 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,5 +1,4 @@
 ---
-# ODL Releng build templates
 - project:
     name: distribution
     jobs:
@@ -10,7 +9,7 @@
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
       - gerrit-maven-clm
-      - gerrit-maven-sonar
+      - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
 
     project: integration/distribution
@@ -22,10 +21,23 @@
     email-upstream: '[int/dist]'
 
     stream:
+      - fluorine:
+          branch: 'master'
       - oxygen:
-          branch: master
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: stable/nitrogen
+          branch: 'stable/nitrogen'
       - carbon:
-          branch: stable/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'