Allow mvn-version to be overrided in distro-check

[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 faf15249a3dfcb691db17a048da43d4a136d766a..3fe467e0475301b16798bba4a5bfe10ef3d5cf81 100644 (file)
--- 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-builder-2c-8g
+    node: centos7-builder-8c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -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}'
 
@@ -239,6 +250,7 @@
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
           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'
@@ -247,6 +259,7 @@
       - distribution-check-repeat-project-build:
           pom: 'distribution/pom.xml'
           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
@@ -269,7 +282,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
@@ -315,7 +328,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties: