X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution.yaml;h=ec32f448579ab64d1c6ae2235f2142dec031d3cd;hb=c7cbc9e7422cc005faa58684ab96a092f0fa2bed;hp=71f166ff20b5eda996f1894500c87f3e26f93e6a;hpb=c569939ee591dc3902dfc6bbbd393aacd3572074;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 71f166ff2..ec32f4485 100644
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,113 +1,36 @@
-# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
-# Otherwise this file will be automatically overwritten by the template
-# autobuilder.
-
+---
 # ODL Releng build templates
 - project:
     name: distribution
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-validate-autorelease-{stream}'
-        - 'distribution-sonar'
-
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-sonar'
+      - '{project-name}-validate-autorelease-{stream}'
+      - distribution-check-{stream}
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
-            branch: 'master'
-            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
+      - 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'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[distribution] [odlparent]'
-
-# For the Job templates below replace instances of:
-# PROJECT_SHORTNAME with your project name (eg. circuitsw)
-# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
-# MAVEN_GOALS with your maven goals to build
-# MAVEN_OPTS with your maven options to build
-
-- job-template:
-    name: 'distribution-sonar'
-    disabled: false
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: 'openjdk8'
-
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: 'master'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: 'H H * * 6'
-        - gerrit-trigger-patch-sonar:
-            name: 'integration/distribution'
-
-    prebuilders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'integration-distribution-settings'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dsonar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'integration-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
-        - email-notification:
-            email-prefix: '[distribution]'
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
-
+    email-upstream: '[int/dist]'
+    archive-artifacts: '**/dependency_tree.txt'