Fix: JaCoCo exclude patterns format

Fix JaCoCo exclude patterns format. JJB 6.x does not process
the job config when double quotes are used and returns the
following error.

Error:
requests.exceptions.HTTPError: 500 Server Error: Server Error for url:
https://jenkins.opendaylight.org/releng/job/distribution-\
merge-managed-argon/config.xml

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

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 6baad68471ba602b9f7f2afd8885d22daff0f813..94074ff78a3cab127a7b11713d2f7cca9597542f 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -132,7 +132,11 @@
     name: "distribution-verify-{type}-{stream}"
 
     disable-job: "false"
-    jacoco-exclude-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
+    jacoco-exclude-pattern: >
+      **/gen/**
+      **/generated-sources/**
+      **/yang-gen**
+      **/pax/**
 
     project-type: freestyle
     node: centos8-builder-8c-8g
@@ -195,7 +199,7 @@
     publishers:
       - findbugs
       - lf-jacoco-report:
-          exclude-pattern: { jacoco-exclude-pattern }
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
       - email-notification:
           email-recipients: "{email-recipients}"
@@ -210,7 +214,11 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     disable-job: false
-    jacoco-exclude-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
+    jacoco-exclude-pattern: >
+      **/gen/**
+      **/generated-sources/**
+      **/yang-gen**
+      **/pax/**
 
     project-type: maven
     node: "centos8-builder-8c-8g"

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