Merge "Remove jjb custom scripting"

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

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index b925ae0bb02ffbfca299dd2d65d9e856a9acf7c5..b7265586d4eb0ac01ab06e96d757a500932ff88d 100644 (file)
--- 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} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -101,7 +102,7 @@
     name: 'integration-distribution-merge-{stream}'
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jre}'
 
     logrotate:
@@ -115,7 +116,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
 
     scm:
         - gerrit-trigger-scm:
@@ -205,7 +206,7 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -219,7 +220,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -255,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}'
@@ -268,7 +269,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl: