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 1dcfe42cb6d92caf5080e7e515f830f31b4eb4a6..c737d8d70d79b2bec5e4aedceb64dddec1ad88d6 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,17 +1,16 @@
 ---
-# ODL Releng build templates
 - project:
     name: distribution
     jobs:
-      # {project-name}- is generic template, distribution- is project specific.
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
-      - '{project-name}-verify-tox-{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
@@ -20,17 +19,25 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[int/dist]'
-    jdk: openjdk8
-    jre: openjdk8
 
     stream:
+      - fluorine:
+          branch: 'master'
       - oxygen:
-          branch: master
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: stable/nitrogen
+          branch: 'stable/nitrogen'
       - carbon:
-          branch: stable/carbon
-          karaf-version: karaf3
-      - boron:
-          branch: stable/boron
+          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'