From 5124bc334088e6069a817c9b65ba37a0445a0da4 Mon Sep 17 00:00:00 2001 From: "marc.wuerth" Date: Thu, 5 Jun 2025 16:58:37 +0200 Subject: [PATCH 1/4] Fix Jenkins pipeline structure --- Jenkinsfile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e5425ac6..09f54bec7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,18 @@ -stage('Unit Tests') { - steps { - sh 'composer install' - sh 'php vendor/bin/phpunit --coverage-openclover ./clover.xml' - clover( - cloverReportDir: 'build/logs', - cloverReportFileName: 'clover.xml', - healthyTarget: [methodCoverage: 70, conditionalCoverage: 80, statementCoverage: 80], - unhealthyTarget: [methodCoverage: 50, conditionalCoverage: 50, statementCoverage: 50], - failingTarget: [methodCoverage: 0, conditionalCoverage: 0, statementCoverage: 0] - ) +pipeline { + agent any + stages { + stage('Unit Tests') { + steps { + sh 'composer install' + sh 'php vendor/bin/phpunit --coverage-openclover ./clover.xml' + clover( + cloverReportDir: 'build/logs', + cloverReportFileName: 'clover.xml', + healthyTarget: [methodCoverage: 70, conditionalCoverage: 80, statementCoverage: 80], + unhealthyTarget: [methodCoverage: 50, conditionalCoverage: 50, statementCoverage: 50], + failingTarget: [methodCoverage: 0, conditionalCoverage: 0, statementCoverage: 0] + ) + } + } } } From 7a11a079fd1401bc7c007c46c2d399fb5405308e Mon Sep 17 00:00:00 2001 From: "marc.wuerth" Date: Thu, 5 Jun 2025 17:01:16 +0200 Subject: [PATCH 2/4] Adjust clover log file folder --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09f54bec7..67dd54e86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { sh 'composer install' sh 'php vendor/bin/phpunit --coverage-openclover ./clover.xml' clover( - cloverReportDir: 'build/logs', + cloverReportDir: './', cloverReportFileName: 'clover.xml', healthyTarget: [methodCoverage: 70, conditionalCoverage: 80, statementCoverage: 80], unhealthyTarget: [methodCoverage: 50, conditionalCoverage: 50, statementCoverage: 50], From 27647b356ee94c22308480c7c9755376eca742b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Thu, 5 Jun 2025 23:41:52 +0200 Subject: [PATCH 3/4] Record Clover Coverage with Jenkins Coverage plugin --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 67dd54e86..dc081c0d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,13 @@ pipeline { steps { sh 'composer install' sh 'php vendor/bin/phpunit --coverage-openclover ./clover.xml' + recordCoverage( + skipPublishingChecks: true, + ignoreParsingErrors: true, + tools: [ + [parser: 'CLOVER', pattern: 'build/logs/clover.xml'] + ] + ) clover( cloverReportDir: './', cloverReportFileName: 'clover.xml', From 110e0991f44f6d7ac43a1838135aa39c97b3c0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Thu, 5 Jun 2025 23:42:37 +0200 Subject: [PATCH 4/4] Do not ignore parsing errors & adjust clover file path --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dc081c0d1..003efee18 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,9 +7,9 @@ pipeline { sh 'php vendor/bin/phpunit --coverage-openclover ./clover.xml' recordCoverage( skipPublishingChecks: true, - ignoreParsingErrors: true, + ignoreParsingErrors: false, tools: [ - [parser: 'CLOVER', pattern: 'build/logs/clover.xml'] + [parser: 'CLOVER', pattern: 'clover.xml'] ] ) clover(