Merge "Update AR projects with all file types to log"

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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index ef41e39123bf52d8c71b0e6f9afdbd6173a131b6..28ee18b4a63f1a06cf69a1c9049d3f98a9ff89a9 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -51,6 +51,7 @@
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
+              -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
@@ -124,6 +125,7 @@
       goals: >
           clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
           -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Dsft.heap.max=4g
           -Djenkins -Dmerge -Dstream={stream}
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
       settings: 'integration-settings'
@@ -185,7 +187,7 @@
 
 - job-template:
     name: 'distribution-check-{stream}'
-    # Like a {project}-distribution-check, but one step less as there is no upstream project involved.
+    # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
     disabled: false
 
     project-type: freestyle
@@ -238,11 +240,7 @@
           mvn-opts: '{opendaylight-infra-mvn-opts}'
       - distribution-check-verify-groupid:
           gerrit-project: 'integration'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      # No need to repeat with SFT as distribution-verify has that covered.
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - integration-distribution-check