X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution.yaml;h=53d72fc8b9caf37880af39291ee140524dda0f57;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=991fdb58146feff1cd4ef73fd78b583249f25c14;hpb=818eff4aa893baca63130dbc45d85250c70b8c84;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 991fdb581..53d72fc8b 100644
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -3,18 +3,14 @@
 - 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}'
-      - 'distribution3-deploy-nitrogen'
-      - 'distribution3-offline-nitrogen'
-      - 'distribution3-check-nitrogen'
+      - gerrit-maven-clm
+      - gerrit-tox-verify
 
     project: integration/distribution
     project-name: distribution
@@ -23,15 +19,23 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[int/dist]'
-    jdk: openjdk8
-    jre: openjdk8
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: master
+      - nitrogen:
+          branch: stable/nitrogen
       - carbon:
           branch: stable/carbon
           karaf-version: karaf3
-      - boron:
-          branch: stable/boron
-          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'