Jenkinsfile

@@ -2,57 +2,21 @@ pipeline {
     agent any
 
     stages {
-        // stage('Build') {
+        stage('build') {
-        //     steps {
-        //         withChecks(name: 'build', includeStage: false) {
-        //             withGradle {
-        //                 sh """
-        //                     ./gradlew clean testClasses --no-daemon
-        //                 """
-        //             }
-        //         }
-        //     }
-        // } // Build
-
-        stage('Build') {
             steps {
-                withChecks(name: 'Test', includeStage: false) {
+                withChecks(name: 'build', includeStage: true) {
-                    withGradle {
+                    sh './gradlew clean testClasses'
-                        sh """
+                }
-                            ./gradlew clean test jacocoTestReport jacocoTestCoverageVerification --no-daemon
+                withChecks(name: 'unit-tests', includeStage: true) {
-                        """
+                    sh './gradlew test'
-                    }
+                }
-                    recordCoverage(tools: [[parser: 'JACOCO', pattern: '**/build/reports/jacoco/test/jacoco*.xml']],
+                withChecks(name: 'test-coverage', includeStage: true) {
-                        id: 'jacoco',
+                    sh './gradlew jacocoTestReport jacocoTestCoverageVerification'
-                        name: 'Jacoco Coverage',
+                    junit '**/build/test-results/test/TEST-*.xml'
-                        sourceCodeRetention: 'EVERY_BUILD',
-                        qualityGates: [
-                            [threshold: 40.0, metric: 'CLASS', baseline: 'PROJECT'],
-                            [threshold: 40.0, metric: 'METHOD', baseline: 'PROJECT'],
-                            [threshold: 40.0, metric: 'LINE', baseline: 'PROJECT'],
-                            [threshold: 40.0, metric: 'BRANCH', baseline: 'PROJECT']])
-                    junit testResults: '**/build/test-results/test/TEST-*.xml'
                 }
             }
-        } // Test
+        }
-
-        stage('Reports') {
-            steps {
-                script {
-                    // junit skipPublishingChecks: true, testResults: '**/build/test-results/test/TEST-*.xml'
-                    // archiveArtifacts artifacts: '**/coverage-sources.zip', allowEmptyArchive: false, fingerprint: false, onlyIfSuccessful: false
-                    publishHTML (target: [
-                        allowMissing: true,
-                        alwaysLinkToLastBuild: false,
-                        keepAll: true,
-                        reportDir: 'app/build/reports/jacoco/test/html',
-                        reportFiles: 'index.html',
-                        reportName: 'Coverage Report'
-                    ])
-                    // def pmd = scanForIssues tool: [$class: 'Pmd'], pattern: 'lib/build/reports/pmd/*.xml'
-                    // publishIssues issues: [pmd]
-                }
-            }
-        } // Post
     }
 }
+
+

app/build.gradle.kts

@@ -37,36 +37,28 @@ jacoco {
     toolVersion = "0.8.12"
 }
 
-tasks.jacocoTestReport {
+tasks.jacocoTestCoverageVerification {
-    reports {
+    violationRules {
-        xml.required.set(true)
+        rule {
-        csv.required.set(false)
+            limit {
-        html.required.set(true)
+                minimum = "0.4".toBigDecimal()
+            }
+        }
+
+        rule {
+            isEnabled = false
+            element = "CLASS"
+            includes = listOf("jenkins.test.*")
+
+            limit {
+                counter = "LINE"
+                value = "TOTALCOUNT"
+                maximum = "0.3".toBigDecimal()
+            }
+        }
     }
 }
 
-//tasks.jacocoTestCoverageVerification {
-//    violationRules {
-//        rule {
-//            limit {
-//                minimum = "0.2".toBigDecimal()
-//            }
-//        }
-//
-//        rule {
-//            isEnabled = false
-//            element = "CLASS"
-//            includes = listOf("jenkins.test.*")
-//
-//            limit {
-//                counter = "LINE"
-//                value = "TOTALCOUNT"
-//                minimum = "0.3".toBigDecimal()
-//            }
-//        }
-//    }
-//}
-
 application {
     // Define the main class for the application.
     mainClass.set("jenkins.test.App")