X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-distribution-jobs.yaml;h=528c7becb83ec44eaa21f6bcd5ad501af0b9b469;hb=359ff75b09935750d9976edd6a48cee590cd66d4;hp=066867173d1f034fbd03dc03ff777deaaeb812e7;hpb=019e5a570f080eb21016ee74cda15a03b8107745;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 066867173..528c7becb 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -2,13 +2,14 @@
 - project:
     name: integration-distribution
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
         - 'integration-distribution-deploy-{stream}'
         - 'integration-distribution-offline-{stream}'
 
     project: integration/distribution
+    project-name: integration-distribution
 
     stream:
         - boron:
@@ -26,7 +27,7 @@
     name: 'integration-distribution-verify-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -41,7 +42,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -71,7 +72,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'integration-settings'
         settings-type: cfp
@@ -87,19 +88,21 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
-    publishers:
-        - email-notification:
-            email-prefix: '[integration]'
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
+    reporters:
         - findbugs
+
+    publishers:
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
+        - email-notification:
+            email-prefix: '[int/dist]'
 
 - job-template:
     name: 'integration-distribution-merge-{stream}'
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jre}'
 
     logrotate:
@@ -113,7 +116,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
 
     scm:
         - gerrit-trigger-scm:
@@ -140,7 +143,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'integration-settings'
         settings-type: cfp
@@ -185,15 +188,15 @@
         - findbugs
 
     publishers:
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
-        - email-notification:
-            email-prefix: '[integration]'
         - maven-deploy:
             id: ''
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
+        - email-notification:
+            email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
 # Goal: Verify distribution starts with no issues when all features are loaded
@@ -203,7 +206,7 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -240,7 +243,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[integration]'
+            email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - archive-build:
             maven-version: '{mvn33}'
@@ -253,7 +256,7 @@
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -289,7 +292,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[integration]'
+            email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - archive-build:
             maven-version: '{mvn33}'