Jenkinsfile

@@ -2,58 +2,21 @@ pipeline {
     agent any
 
     stages {
-        stage('Build') {
+        stage('build') {
             steps {
-                withChecks(name: 'build', includeStage: false) {
-                    withGradle {
-                        sh """
-                            ./gradlew clean testClasses --no-daemon
-                        """
+                withChecks(name: 'build', in) {
+                    sh './gradlew clean testClasses'
                 }
+                withChecks(name: 'unit-tests', in) {
+                    sh './gradlew test'
                 }
-            }
-        } // Build
-
-        stage('Test') {
-            steps {
-                withChecks(name: 'test-coverage', includeStage: false) {
-                    withGradle {
-                        sh """
-                            ./gradlew test jacocoTestReport jacocoTestCoverageVerification --no-daemon
-                        """
-                    }
-                    recordCoverage(tools: [[parser: 'JACOCO', pattern: '**/build/reports/jacoco/test/jacoco*.xml']],
-                        id: 'jacoco',
-                        name: 'Jacoco Coverage',
-                        sourceCodeRetention: 'EVERY_BUILD',
-                        qualityGates: [
-                            [threshold: 40.0, metric: 'CLASS', baseline: 'PROJECT', unstable: true],
-                            [threshold: 40.0, metric: 'METHOD', baseline: 'PROJECT', unstable: true],
-                            [threshold: 40.0, metric: 'LINE', baseline: 'PROJECT', unstable: true],
-                            [threshold: 40.0, metric: 'BRANCH', baseline: 'PROJECT', unstable: true]]
-
-                    )
-                }
-            }
-        } // Test
-
-        stage('Post') {
-            steps {
-                script {
+                withChecks(name: 'test-coverage', in) {
+                    sh './gradlew jacocoTestReport jacocoTestCoverageVerification'
                     junit '**/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,35 +37,27 @@ jacoco {
     toolVersion = "0.8.12"
 }
 
-tasks.jacocoTestReport {
-    reports {
-        xml.required.set(true)
-        csv.required.set(false)
-        html.required.set(true)
+tasks.jacocoTestCoverageVerification {
+    violationRules {
+        rule {
+            limit {
+                minimum = "0.4".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()
-//            }
-//        }
-//    }
-//}
+        rule {
+            isEnabled = false
+            element = "CLASS"
+            includes = listOf("jenkins.test.*")
+
+            limit {
+                counter = "LINE"
+                value = "TOTALCOUNT"
+                maximum = "0.3".toBigDecimal()
+            }
+        }
+    }
+}
 
 application {
     // Define the main class for the application.