X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=3fe467e0475301b16798bba4a5bfe10ef3d5cf81;hb=c47ad01a1ad865a528dcd38c537ba784375b8118;hp=d9d9a76eb61c283f99e1374d0c5a7404e3e0e345;hpb=10833fd3e59e313340cd9f20f7876cc466bd13dc;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d9d9a76eb..3fe467e04 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -6,7 +6,7 @@
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-8c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -53,7 +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.
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
@@ -78,7 +78,7 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     jdk: '{jre}'
 
     properties:
@@ -188,11 +188,22 @@
 
 - job-template:
     name: 'distribution-check-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-version: mvn33
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
     jdk: '{jdk}'
 
@@ -238,14 +249,18 @@
       - distribution-check-wipe
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: 'integration'
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
           pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
       - distribution-check-warn-9192
@@ -267,7 +282,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
@@ -313,7 +328,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties: