Bug 9307: Do not parallelize SFT in Distribution

[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 28ee18b4a63f1a06cf69a1c9049d3f98a9ff89a9..d1771099eaae2678c6787592f23116e690934bc0 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -53,6 +53,7 @@
               -Dstream={stream}
               -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features for SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
@@ -237,13 +238,20 @@
       - 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-set-variables
+      - distribution-check-warn-9191
+      - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
-      - integration-distribution-check
+      - distribution-check-bootup
 
     publishers:
       - email-notification: