Skip to content

Commit

Permalink
Fix: JaCoCo exclude patterns format
Browse files Browse the repository at this point in the history
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 <[email protected]>
Change-Id: I6c32d6d9e510a026af59f3dce0ca6a5fc6847dce
  • Loading branch information
askb committed Feb 27, 2024
1 parent 6bea943 commit ef697e7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
14 changes: 11 additions & 3 deletions jjb/integration/distribution/distribution-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand All @@ -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"
Expand Down
12 changes: 10 additions & 2 deletions jjb/releng-templates-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ef697e7

Please sign in to comment.