From 44d988db616a5b9c85d3b9c92b3528099e8d2705 Mon Sep 17 00:00:00 2001 From: Dima Date: Wed, 24 Jul 2024 14:44:24 +0300 Subject: [PATCH] fixes --- .../library/configuration/GenericIssueFormat.groovy | 10 ---------- .../jenkins/library/steps/ResultsTransformer.groovy | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/configuration/GenericIssueFormat.groovy b/src/ru/pulsar/jenkins/library/configuration/GenericIssueFormat.groovy index 392e73d..c9cfce1 100644 --- a/src/ru/pulsar/jenkins/library/configuration/GenericIssueFormat.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/GenericIssueFormat.groovy @@ -1,7 +1,6 @@ package ru.pulsar.jenkins.library.configuration import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.annotation.JsonValue enum GenericIssueFormat { @JsonProperty("Generic_Issue") @@ -10,13 +9,4 @@ enum GenericIssueFormat { @JsonProperty("Generic_Issue_10_3") GENERIC_ISSUE_10_3 - @JsonValue - String toValue() { - if (this == GENERIC_ISSUE) { - return "Generic_Issue" - } else { - return "Generic_Issue_10_3" - } - } - } \ No newline at end of file diff --git a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy index abfeaee..b01565c 100644 --- a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy +++ b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy @@ -1,6 +1,7 @@ package ru.pulsar.jenkins.library.steps import ru.pulsar.jenkins.library.IStepExecutor +import ru.pulsar.jenkins.library.configuration.GenericIssueFormat import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.ResultsTransformerType import ru.pulsar.jenkins.library.configuration.SourceFormat @@ -44,7 +45,10 @@ class ResultsTransformer implements Serializable { Logger.println("Конвертация результата EDT в Generic Issue с помощью stebi") def genericIssueFile = "$env.WORKSPACE/$RESULT_FILE" - def genericIssuesFormat = config.resultsTransformOptions.genericIssueFormat.toValue() + def genericIssuesFormat = "Generic_Issue" + if (config.resultsTransformOptions.genericIssueFormat == GenericIssueFormat.GENERIC_ISSUE_10_3) { + genericIssuesFormat = "Generic_Issue_10_3" + } steps.cmd("stebi convert --Format $genericIssuesFormat -r $edtValidateFile $genericIssueFile $srcDir")