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 and tests

Browse Source
This commit is contained in:
Dima
2024-07-24 14:35:13 +03:00
parent 5d01386b79
commit 20a66450c7
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/globalConfiguration.json
View File

@@ -89,6 +89,8 @@
"publishToJUnitReport": true
},
"resultsTransform": {
"transformer": "stebi",
"genericIssueFormat": "Generic_Issue",
"removeSupport": true,
"supportLevel": 0
},

15
src/ru/pulsar/jenkins/library/configuration/GenericIssueFormat.groovy
View File

@@ -1,7 +1,7 @@
package ru.pulsar.jenkins.library.configuration
import com.cloudbees.groovy.cps.NonCPS
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.annotation.JsonValue
enum GenericIssueFormat {
@JsonProperty("Generic_Issue")
@@ -10,13 +10,12 @@ enum GenericIssueFormat {
@JsonProperty("Generic_Issue_10_3")
GENERIC_ISSUE_10_3
@Override
@NonCPS
String toString() {
switch(this) {
case GENERIC_ISSUE: return "Generic_Issue"
case GENERIC_ISSUE_10_3: return "Generic_Issue_10_3"
default: throw new IllegalArgumentException()
@JsonValue
String toValue() {
if (this == GENERIC_ISSUE) {
return "Generic_Issue"
} else {
return "Generic_Issue_10_3"
}
}

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

@@ -44,7 +44,7 @@ class ResultsTransformer implements Serializable {
Logger.println("Конвертация результата EDT в Generic Issue с помощью stebi")
def genericIssueFile = "$env.WORKSPACE/$RESULT_FILE"
def genericIssuesFormat = config.resultsTransformOptions.genericIssueFormat.toString()
def genericIssuesFormat = config.resultsTransformOptions.genericIssueFormat.toValue()
steps.cmd("stebi convert --Format $genericIssuesFormat -r $edtValidateFile $genericIssueFile $srcDir")

7
test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java
View File

@@ -47,8 +47,11 @@ class ConfigurationReaderTest {
assertThat(jobConfiguration.getSyntaxCheckOptions().getCheckModes()).hasSize(4);
assertThat(jobConfiguration.getResultsTransformOptions().getRemoveSupport()).isFalse();
assertThat(jobConfiguration.getResultsTransformOptions().getSupportLevel()).isZero();
ResultsTransformOptions resultsTransformOptions = jobConfiguration.getResultsTransformOptions();
assertThat(resultsTransformOptions.getTransformer()).isEqualTo(ResultsTransformerType.STEBI);
assertThat(resultsTransformOptions.getGenericIssueFormat()).isEqualTo(GenericIssueFormat.GENERIC_ISSUE_10_3);
assertThat(resultsTransformOptions.getRemoveSupport()).isFalse();
assertThat(resultsTransformOptions.getSupportLevel()).isZero();
assertThat(jobConfiguration.getSmokeTestOptions().getVrunnerSettings()).contains("./tools/vrunner-smoke.json");
assertThat(jobConfiguration.getSmokeTestOptions().isPublishToAllureReport()).isFalse();

2
test/unit/resources/jobConfiguration.json
View File

@@ -54,6 +54,8 @@
]
},
"resultsTransform": {
"transformer": "stebi",
"genericIssueFormat": "Generic_Issue_10_3",
"removeSupport": false
},
"smoke": {