From aa4aaa271d925c04d576558743be335828a3f0df Mon Sep 17 00:00:00 2001 From: Dima Date: Sun, 25 Aug 2024 12:52:19 +0300 Subject: [PATCH] add coverage for yaxunit, fix smoke dbgs port --- .../jenkins/library/steps/SonarScanner.groovy | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy index 9103e79..56c56c9 100644 --- a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy @@ -98,21 +98,29 @@ class SonarScanner implements Serializable { } - if (config.stageFlags.bdd && config.bddOptions.coverage - || config.stageFlags.smoke && config.smokeTestOptions.coverage) { + def stageFlags = config.stageFlags + + if (stageFlags.bdd && config.bddOptions.coverage + || stageFlags.smoke && config.smokeTestOptions.coverage + || stageFlags.yaxunit && config.yaxunitOptions.coverage) { StringJoiner coveragePathsConstructor = new StringJoiner(",") - if (config.stageFlags.bdd && config.bddOptions.coverage) { + if (stageFlags.bdd && config.bddOptions.coverage) { steps.unstash(Bdd.COVERAGE_STASH_NAME) coveragePathsConstructor.add(Bdd.COVERAGE_STASH_PATH) } - if (config.stageFlags.smoke && config.smokeTestOptions.coverage) { + if (stageFlags.smoke && config.smokeTestOptions.coverage) { steps.unstash(SmokeTest.COVERAGE_STASH_NAME) coveragePathsConstructor.add(SmokeTest.COVERAGE_STASH_PATH) } + if (stageFlags.yaxunit && config.yaxunitOptions.coverage) { + steps.unstash(Yaxunit.COVERAGE_STASH_NAME) + coveragePathsConstructor.add(Yaxunit.COVERAGE_STASH_PATH) + } + String coveragePaths = coveragePathsConstructor.toString() sonarCommand += " -Dsonar.coverageReportPaths=${coveragePaths}"