Switch distribution-csit-managed to CentOS8

[releng/builder.git] / jjb / integration / distribution / distribution-templates.yaml

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 477735a4f9d52fcef0fc7946cec9ad065accbc84..e2a1db37e99ffe3a37d09b4ba4297b74edf9e2a8 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -6,7 +6,7 @@
     # Default parameters #
     ######################
 
-    mvn-version: mvn35
+    mvn-version: mvn38
     csit-gate-list: ""
     block_on_csit: false
     # Unless block_on_csit is true, the failure-threshold will be ignored. For project jobs that
@@ -109,6 +109,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - distribution-check-bootup
 
       - trigger-builds:
@@ -174,7 +175,7 @@
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: pom.xml
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -258,7 +259,7 @@
           path: "$KARAF_ARTIFACT/src/main/assembly"
 
     maven:
-      maven-name: "mvn35"
+      maven-name: "mvn38"
       root-pom: "pom.xml"
       goals: >
         clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
@@ -299,7 +300,7 @@
     # Default parameters #
     ######################
     disable-job: false
-    mvn-version: mvn35
+    mvn-version: mvn38
 
     #####################
     # Job Configuration #
@@ -328,7 +329,7 @@
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -382,6 +383,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: "{dist-pom}"
+          settings-project: integration
       - distribution-check-bootup
 
     publishers:
@@ -457,7 +459,7 @@
     disable-job: false
 
     project-type: freestyle
-    node: centos7-builder-4c-4g
+    node: centos8-builder-4c-4g
     concurrent: false
     disabled: "{disable-job}"