Fix: JaCoCo exclude patterns format

[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 e6d4accedb8c9e9657218bf6b51adcd5834f4cb8..ad36d4702487f553cc04a8dc519f762c66ae9e7e 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -26,7 +26,7 @@
     disabled: "{disable-job}"
 
     project-type: freestyle
-    node: "centos7-builder-8c-8g"
+    node: "centos8-builder-8c-8g"
     concurrent: true
 
     properties:
@@ -132,9 +132,14 @@
     name: "distribution-verify-{type}-{stream}"
 
     disable-job: "false"
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**
 
     project-type: freestyle
-    node: centos7-builder-8c-8g
+    node: centos8-builder-8c-8g
     concurrent: true
     disabled: "{disable-job}"
 
@@ -175,7 +180,7 @@
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn38
+          maven-version: "{mvn-version}"
           pom: pom.xml
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -193,7 +198,8 @@
 
     publishers:
       - findbugs
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
       - email-notification:
           email-recipients: "{email-recipients}"
@@ -208,9 +214,14 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     disable-job: false
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**
 
     project-type: maven
-    node: "centos7-builder-8c-8g"
+    node: "centos8-builder-8c-8g"
     disabled: "{disable-job}"
 
     properties:
@@ -287,7 +298,8 @@
           id: ""
           unique-version: true
           deploy-unstable: false
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
       - email-notification:
           email-recipients: "{email-recipients}"
@@ -310,7 +322,7 @@
     disabled: "{disable-job}"
 
     project-type: freestyle
-    node: "centos7-builder-8c-8g"
+    node: "centos8-builder-8c-8g"
     concurrent: true
 
     properties:
@@ -329,7 +341,7 @@
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
       - maven-exec:
-          maven-version: mvn38
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -400,7 +412,7 @@
     # This job works for both managed & self-managed distro.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos8-builder-2c-8g
     concurrent: false
 
     properties:
@@ -430,8 +442,6 @@
           controller-scope: ""
           controller-use-features-boot: ""
           feature-elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-jdk-version:
-          jdkversion: "{jre}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
 
@@ -441,6 +451,8 @@
 
     builders:
       - integration-detect-variables
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - distribution-check-bootup
 
     publishers:
@@ -459,7 +471,7 @@
     disable-job: false
 
     project-type: freestyle
-    node: centos7-builder-4c-4g
+    node: centos8-builder-4c-4g
     concurrent: false
     disabled: "{disable-job}"
 
@@ -480,8 +492,6 @@
           branch: "{branch}"
       - integration-bundle-url:
           bundle-url: "{bundle-url}"
-      - integration-jdk-version:
-          jdkversion: "{jre}"
       - distribution-karaf-version:
           karaf-version: "karaf4"
 
@@ -491,6 +501,8 @@
 
     builders:
       - integration-detect-variables
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - distribution-check-bootup
 
     publishers: