Merge "Fix for Ocata Stacking Failure"

[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 12438dd18b62c390f19b8f903676431618a33b37..07fd62c2e9f0c7a993b06a8f5fe981ccd32230e8 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -51,7 +51,8 @@
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
-              {opendaylight-infra-mvn-opts}
+              -Dsft.heap.max=4g
+              {opendaylight-infra-parallel-mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
@@ -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'
@@ -235,10 +237,14 @@
       - distribution-check-wipe
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
       - distribution-check-verify-groupid:
           gerrit-project: 'integration'
-      # No need to repeat with SFT as distribution-verify has that covered.
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-project-build:
+          pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - integration-distribution-check