Fix: JaCoCo exclude patterns format

The commit ef697e714076 with the multiline format is incorrect
since this is a comma separated list.

Change-Id: Ifa9e7091338d52f197663f2c3d593b8ce9675d2b
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 94074ff78a3cab127a7b11713d2f7cca9597542f..ad36d4702487f553cc04a8dc519f762c66ae9e7e 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -132,10 +132,10 @@
     name: "distribution-verify-{type}-{stream}"
 
     disable-job: "false"
-    jacoco-exclude-pattern: >
-      **/gen/**
-      **/generated-sources/**
-      **/yang-gen**
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
       **/pax/**
 
     project-type: freestyle
@@ -214,10 +214,10 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     disable-job: false
-    jacoco-exclude-pattern: >
-      **/gen/**
-      **/generated-sources/**
-      **/yang-gen**
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
       **/pax/**
 
     project-type: maven

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index db1f3b2ee607161a2b217d72cdf5c311683f8d1b..6e97e4584971d72831c110d9909c73f7cb833471 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -98,10 +98,10 @@
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
     disable-job: false
-    jacoco-exclude-pattern: >
-      **/gen/**
-      **/generated-sources/**
-      **/yang-gen**
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
       **/pax/**
 
     #####################
@@ -172,10 +172,10 @@
     # Default parameters #
     ######################
     disable-job: "false"
-    jacoco-exclude-pattern: >
-      **/gen/**
-      **/generated-sources/**
-      **/yang-gen**
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
       **/pax/**
 
     archive-artifacts: >