From 34e4a8b8ab42b33c00c3f36f39711e35bc7dba8a Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 28 Feb 2024 09:13:38 +1000 Subject: [PATCH] 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 --- .../distribution/distribution-templates.yaml | 16 ++++++++-------- jjb/releng-templates-java.yaml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 94074ff78a..ad36d47024 100644 --- 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 db1f3b2ee6..6e97e45849 100644 --- 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: > -- 2.36.6