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

fixes

Browse Source
This commit is contained in:
Dima
2024-08-31 11:20:19 +03:00
parent 49fe3ea22a
commit 453abf4ec6
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle.kts
View File

@@ -35,17 +35,14 @@ val junitVersion = "5.6.1"
val spockVersion = "1.3-groovy-2.4" val spockVersion = "1.3-groovy-2.4"
val groovyVersion = "2.4.19" val groovyVersion = "2.4.19"
val slf4jVersion = "1.8.0-beta4" val slf4jVersion = "1.8.0-beta4"
var jacksonVersion = "2.9.8" val jsonschemaVersion = "4.36.0"
dependencies { dependencies {
implementation("org.codehaus.groovy", "groovy-all", groovyVersion) implementation("org.codehaus.groovy", "groovy-all", groovyVersion)
// jackson
implementation("com.fasterxml.jackson.module", "jackson-module-jsonSchema", jacksonVersion)
// jsonschema-generator // jsonschema-generator
implementation("com.github.victools", "jsonschema-generator", "4.36.0") implementation("com.github.victools", "jsonschema-generator", jsonschemaVersion)
implementation("com.github.victools", "jsonschema-module-jackson", "4.36.0") implementation("com.github.victools", "jsonschema-module-jackson", jsonschemaVersion)
// unit-tests // unit-tests
testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion) testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)

9
src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy
View File

@@ -58,19 +58,12 @@ class ResultsTransformer implements Serializable {
if (config.resultsTransformOptions.removeSupport) { if (config.resultsTransformOptions.removeSupport) {
def supportLevel = config.resultsTransformOptions.supportLevel def supportLevel = config.resultsTransformOptions.supportLevel
steps.cmd("stebi transform --Format $genericIssuesFormat --remove_support $supportLevel --src $srcDir $genericIssueFile") steps.cmd("stebi transform --Format $genericIssuesFormat --remove_support $supportLevel --src $srcDir $genericIssueFile")
} }
} else { } else {
Logger.println("Конвертация результата EDT в Issues с помощью edt-ripper") Logger.println("Конвертация результата EDT в Issues с помощью edt-ripper")
if (config.sourceFormat == SourceFormat.DESIGNER) {
steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH)
steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP)
}
srcDir = FileUtils.getFilePath("$env.WORKSPACE/$config.srcDir") srcDir = FileUtils.getFilePath("$env.WORKSPACE/$config.srcDir")
def projectName = srcDir.getName() def projectName = srcDir.getName()

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

@@ -61,13 +61,6 @@ class SonarScanner implements Serializable {
if (config.stageFlags.edtValidate) { if (config.stageFlags.edtValidate) {
steps.unstash(ResultsTransformer.RESULT_STASH) steps.unstash(ResultsTransformer.RESULT_STASH)
if (config.sourceFormat == SourceFormat.DESIGNER) {
steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH)
steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP)
}
if (config.resultsTransformOptions.transformer == ResultsTransformerType.STEBI) { if (config.resultsTransformOptions.transformer == ResultsTransformerType.STEBI) {
sonarCommand += " -Dsonar.externalIssuesReportPaths=" + ResultsTransformer.RESULT_FILE sonarCommand += " -Dsonar.externalIssuesReportPaths=" + ResultsTransformer.RESULT_FILE
} else { } else {