From b50bfe256e317121f231b817fa36f005641e3e67 Mon Sep 17 00:00:00 2001 From: Sebastien Dinot Date: Mon, 27 May 2019 23:55:53 +0200 Subject: [PATCH 1/5] Set Jacoco fail and warning thresholds in CI script --- Jenkinsfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69e40fdf3..87afc3ddb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,16 @@ pipeline { } } junit testResults: '**/target/surefire-reports/*.xml' - jacoco execPattern:'target/**.exec', classPattern: '**/classes', sourcePattern: '**/src/main/java' + jacoco execPattern: 'target/**.exec', + classPattern: '**/classes', + sourcePattern: '**/src/main/java', + changeBuildStatus: true, + maximumBranchCoverage: '85', minimumBranchCoverage: '80', + maximumClassCoverage: '100', minimumClassCoverage: '95', + maximumComplexityCoverage: '85', minimumComplexityCoverage: '80', + maximumInstructionCoverage: '90', minimumInstructionCoverage: '85', + maximumLineCoverage: '90', minimumLineCoverage: '85', + maximumMethodCoverage: '95', minimumMethodCoverage: '90' recordIssues enabledForFailure: true, tools: [mavenConsole(), java(), javaDoc()] recordIssues enabledForFailure: true, tool: checkStyle() recordIssues enabledForFailure: true, tool: spotBugs() -- GitLab From 13f93fca628c60b272208d3fe2f3a0d29f0048fb Mon Sep 17 00:00:00 2001 From: Sebastien Dinot Date: Tue, 28 May 2019 17:46:07 +0200 Subject: [PATCH 2/5] Remove useless thresholds --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 87afc3ddb..905609447 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,12 +45,12 @@ pipeline { classPattern: '**/classes', sourcePattern: '**/src/main/java', changeBuildStatus: true, - maximumBranchCoverage: '85', minimumBranchCoverage: '80', - maximumClassCoverage: '100', minimumClassCoverage: '95', - maximumComplexityCoverage: '85', minimumComplexityCoverage: '80', - maximumInstructionCoverage: '90', minimumInstructionCoverage: '85', - maximumLineCoverage: '90', minimumLineCoverage: '85', - maximumMethodCoverage: '95', minimumMethodCoverage: '90' + minimumBranchCoverage: '85', + minimumClassCoverage: '100', + minimumComplexityCoverage: '85', + minimumInstructionCoverage: '90', + minimumLineCoverage: '90', + minimumMethodCoverage: '95' recordIssues enabledForFailure: true, tools: [mavenConsole(), java(), javaDoc()] recordIssues enabledForFailure: true, tool: checkStyle() recordIssues enabledForFailure: true, tool: spotBugs() -- GitLab From 54fa651a2d2afb77dd255374472f868ed03b173e Mon Sep 17 00:00:00 2001 From: Sebastien Dinot Date: Tue, 28 May 2019 18:21:34 +0200 Subject: [PATCH 3/5] Restore previous Jacoco thresholds in CI script --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 905609447..87afc3ddb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,12 +45,12 @@ pipeline { classPattern: '**/classes', sourcePattern: '**/src/main/java', changeBuildStatus: true, - minimumBranchCoverage: '85', - minimumClassCoverage: '100', - minimumComplexityCoverage: '85', - minimumInstructionCoverage: '90', - minimumLineCoverage: '90', - minimumMethodCoverage: '95' + maximumBranchCoverage: '85', minimumBranchCoverage: '80', + maximumClassCoverage: '100', minimumClassCoverage: '95', + maximumComplexityCoverage: '85', minimumComplexityCoverage: '80', + maximumInstructionCoverage: '90', minimumInstructionCoverage: '85', + maximumLineCoverage: '90', minimumLineCoverage: '85', + maximumMethodCoverage: '95', minimumMethodCoverage: '90' recordIssues enabledForFailure: true, tools: [mavenConsole(), java(), javaDoc()] recordIssues enabledForFailure: true, tool: checkStyle() recordIssues enabledForFailure: true, tool: spotBugs() -- GitLab From d182e51bc5db2871eac210de934bb414a2599d44 Mon Sep 17 00:00:00 2001 From: Sebastien Dinot Date: Wed, 12 Jun 2019 15:36:58 +0200 Subject: [PATCH 4/5] Add exclusion pattern to Jacoco parameters --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 87afc3ddb..0e54b922a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,6 +44,7 @@ pipeline { jacoco execPattern: 'target/**.exec', classPattern: '**/classes', sourcePattern: '**/src/main/java', + exclusionPattern: 'fr/cs/examples/**/*.class', changeBuildStatus: true, maximumBranchCoverage: '85', minimumBranchCoverage: '80', maximumClassCoverage: '100', minimumClassCoverage: '95', -- GitLab From 1825d150bb3464ca2196f3402ba3ed7e107e47c9 Mon Sep 17 00:00:00 2001 From: Sebastien Dinot Date: Wed, 12 Jun 2019 15:39:05 +0200 Subject: [PATCH 5/5] Reorder Jacoco thresholds in Jenkinsfile --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e54b922a..9c5f59236 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,12 +46,12 @@ pipeline { sourcePattern: '**/src/main/java', exclusionPattern: 'fr/cs/examples/**/*.class', changeBuildStatus: true, - maximumBranchCoverage: '85', minimumBranchCoverage: '80', - maximumClassCoverage: '100', minimumClassCoverage: '95', - maximumComplexityCoverage: '85', minimumComplexityCoverage: '80', - maximumInstructionCoverage: '90', minimumInstructionCoverage: '85', - maximumLineCoverage: '90', minimumLineCoverage: '85', - maximumMethodCoverage: '95', minimumMethodCoverage: '90' + minimumBranchCoverage: '80', maximumBranchCoverage: '85', + minimumClassCoverage: '95', maximumClassCoverage: '100', + minimumComplexityCoverage: '80', maximumComplexityCoverage: '85', + minimumInstructionCoverage: '85', maximumInstructionCoverage: '90', + minimumLineCoverage: '85', maximumLineCoverage: '90', + minimumMethodCoverage: '90', maximumMethodCoverage: '95' recordIssues enabledForFailure: true, tools: [mavenConsole(), java(), javaDoc()] recordIssues enabledForFailure: true, tool: checkStyle() recordIssues enabledForFailure: true, tool: spotBugs() -- GitLab