jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

fix merge

Browse Source
This commit is contained in:
Dima
2024-11-27 12:53:08 +03:00
parent 494a53586e
commit 7a5669e86d
3 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
View File

@@ -60,10 +60,6 @@ class JobConfiguration implements Serializable {
@JsonPropertyDescription("Настройки замеров покрытия")
CoverageOptions coverageOptions;
@JsonProperty("coverage")
@JsonPropertyDescription("Настройки замеров покрытия")
CoverageOptions coverageOptions;
@JsonProperty("yaxunit")
@JsonPropertyDescription("Настройки YAXUnit")
YaxunitOptions yaxunitOptions

29
src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
View File

@@ -98,35 +98,6 @@ class SonarScanner implements Serializable {
}
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 (stageFlags.bdd && config.bddOptions.coverage) {
steps.unstash(Bdd.COVERAGE_STASH_NAME)
coveragePathsConstructor.add(Bdd.COVERAGE_STASH_PATH)
}
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}"
}
if (config.sonarQubeOptions.waitForQualityGate) {
def timeoutInSeconds = config.timeoutOptions.sonarqube * 60
sonarCommand += ' -Dsonar.qualitygate.wait=true'

3
src/ru/pulsar/jenkins/library/steps/Yaxunit.groovy
View File

@@ -121,7 +121,7 @@ class Yaxunit implements Serializable {
}
if (options.publishToAllureReport) {
String allureReport = "./build/out/allure/yaxunit/junit.xml"
String allureReport = "./build/out/yaxunit/junit.xml"
FilePath pathToAllureReport = FileUtils.getFilePath("$env.WORKSPACE/$allureReport")
String allureReportDir = FileUtils.getLocalPath(pathToAllureReport.getParent())
@@ -134,5 +134,4 @@ class Yaxunit implements Serializable {
steps.stash(COVERAGE_STASH_NAME, COVERAGE_STASH_PATH, true)
}
}
}