diff --git a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy index bb4f7886..1f338768 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy @@ -11,7 +11,7 @@ import ru.pulsar.jenkins.library.utils.Logger class EdtValidate implements Serializable { public static final String RESULT_STASH = 'edt-validate' - public static final String RESULT_FILE = 'build/out/edt-validate.out' + public static final String RESULT_FILE = 'build/out/edt-validate/edt-validate.out' private final JobConfiguration config @@ -55,8 +55,17 @@ class EdtValidate implements Serializable { engine.edtValidate(steps, config, projectList) - steps.archiveArtifacts("$DesignerToEdtFormatTransformation.WORKSPACE/.metadata/.log") - steps.archiveArtifacts(RESULT_FILE) steps.stash(RESULT_STASH, RESULT_FILE) + + // Архивируем все результаты в отдельном архиве и отправляем в артефакты. + def resultDir = FileUtils.getFilePath("$RESULT_FILE").getParent() + + String resultLogFrom = FileUtils.getFilePath("$env.WORKSPACE/$DesignerToEdtFormatTransformation.WORKSPACE/.metadata/.log") + String resultLogTo = FileUtils.getFilePath("$env.WORKSPACE/$resultDir/.log") + FileUtils.loadFile(resultLogFrom, env, resultLogTo) // копируем лог в папку, которая будет архивироваться + + String archivePath = "edt-validate.zip" + Boolean archiveArtifacts = true + steps.zip("$resultDir", archivePath, '', archiveArtifacts) } } diff --git a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy index 0eabf616..383d3fd8 100644 --- a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy +++ b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy @@ -13,7 +13,7 @@ import java.nio.file.Paths class ResultsTransformer implements Serializable { public static final String RESULT_STASH = 'edt-issues' - public static final String RESULT_FILE = 'build/out/edt-issues.json' + public static final String RESULT_FILE = 'build/out/edt-validate/edt-issues.json' private final JobConfiguration config @@ -73,8 +73,13 @@ class ResultsTransformer implements Serializable { } - steps.archiveArtifacts(RESULT_FILE) steps.stash(RESULT_STASH, RESULT_FILE) + // Архивируем результат в отдельный архив и отправляем в артефакты. + def resultDir = FileUtils.getFilePath("$edtValidateFile").getParent() + String archivePath = "edt-validate-ResultsTransformer.zip" + Boolean archiveArtifacts = true + steps.zip("$resultDir", archivePath, '', archiveArtifacts) + } }