Merge "Fix genius CSIT jobs"

[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 ef055544384e83d2dc6a6d5518f54d19d173855b..1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -188,13 +188,24 @@
 
 - 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: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -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