Merge "Configure tep-ip for genius auto tunnels"

[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..d9d9a76eb61c283f99e1374d0c5a7404e3e0e345 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -35,7 +35,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -51,7 +51,9 @@
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -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
@@ -61,7 +63,7 @@
 
     publishers:
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
@@ -104,7 +106,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'integration/distribution'
           branch: '{branch}'
 
@@ -124,6 +126,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'
@@ -177,7 +180,7 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
@@ -185,7 +188,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
@@ -226,7 +229,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -235,17 +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'
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - 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: