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 07fd62c2e9f0c7a993b06a8f5fe981ccd32230e8..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: '**'
@@ -52,7 +52,8 @@
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
               -Dsft.heap.max=4g
-              {opendaylight-infra-parallel-mvn-opts}
+              {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
@@ -62,7 +63,7 @@
 
     publishers:
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
@@ -105,7 +106,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'integration/distribution'
           branch: '{branch}'
 
@@ -179,7 +180,7 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
@@ -228,7 +229,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -245,9 +246,12 @@
       - 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: