Merge branch 'FromEDTTransform' into develop

src/ru/pulsar/jenkins/library/IStepExecutor.groovy

@@ -33,8 +33,14 @@ interface IStepExecutor {
 
     EnvironmentAction env()
 
+    def dir(String path, Closure body)
+
     void createDir(String path)
 
+    void deleteDir()
+
+    void deleteDir(String path)
+
     def withEnv(List<String> strings, Closure body)
 
     def archiveArtifacts(String path)

src/ru/pulsar/jenkins/library/StepExecutor.groovy

@@ -79,6 +79,25 @@ class StepExecutor implements IStepExecutor {
         steps.createDir(path)
     }
 
+    @Override
+    def dir(String path, Closure body) {
+        steps.dir(path) {
+            body()
+        }
+    }
+
+    @Override
+    void deleteDir() {
+        steps.deleteDir()
+    }
+
+    @Override
+    void deleteDir(String path) {
+        steps.dir(path) {
+            steps.deleteDir()
+        }
+    }
+
     @Override
     def withEnv(List<String> strings, Closure body) {
         steps.withEnv(strings) {

src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy

@@ -34,7 +34,7 @@ class DesignerToEdtFormatTransformation implements Serializable {
         def workspaceDir = "$env.WORKSPACE/$WORKSPACE"
         def configurationRoot = new File(env.WORKSPACE, config.srcDir).getAbsolutePath()
 
-        steps.createDir(workspaceDir)
+        steps.deleteDir(workspaceDir)
 
         Logger.println("Конвертация исходников из формата конфигуратора в формат EDT")
 

src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy

@@ -38,8 +38,8 @@ class EdtToDesignerFormatTransformation implements Serializable {
         def workspaceDir = "$env.WORKSPACE/$WORKSPACE" 
         def configurationRoot = "$env.WORKSPACE/$CONFIGURATION_DIR"
 
-        steps.createDir(workspaceDir)
-        steps.createDir(configurationRoot)
+        steps.deleteDir(workspaceDir)
+        steps.deleteDir(configurationRoot)
 
         Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")
 

src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy

@@ -38,11 +38,11 @@ class EdtValidate implements Serializable {
 
             projectList = "--project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME"
         } else {
-            projectList = "--project-list '$config.srcDir'"
+            String projectDir = new File("$env.WORKSPACE/$config.srcDir").getCanonicalPath()
+            projectList = "--project-list '$projectDir'"
         }
 
         def resultFile = "$env.WORKSPACE/$RESULT_FILE"
-        steps.createDir(new File(resultFile).getParent())
 
         Logger.println("Выполнение валидации EDT")
 

src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy

@@ -2,9 +2,12 @@ package ru.pulsar.jenkins.library.steps
 
 import ru.pulsar.jenkins.library.IStepExecutor
 import ru.pulsar.jenkins.library.configuration.JobConfiguration
+import ru.pulsar.jenkins.library.configuration.SourceFormat
 import ru.pulsar.jenkins.library.ioc.ContextRegistry
 import ru.pulsar.jenkins.library.utils.Logger
 
+import java.nio.file.Paths
+
 class ResultsTransformer implements Serializable {
 
     public static final String RESULT_STASH = 'edt-generic-issue'
@@ -35,11 +38,12 @@ class ResultsTransformer implements Serializable {
         def edtValidateFile = "$env.WORKSPACE/$EdtValidate.RESULT_FILE"
         def genericIssueFile = "$env.WORKSPACE/$RESULT_FILE"
 
-        steps.cmd("stebi convert $edtValidateFile $genericIssueFile $config.srcDir")
+        String srcDir = config.sourceFormat == SourceFormat.DESIGNER ? config.srcDir : Paths.get(config.srcDir, "src")
+        steps.cmd("stebi convert $edtValidateFile $genericIssueFile $srcDir")
 
         if (config.resultsTransformOptions.removeSupport) {
             def supportLevel = config.resultsTransformOptions.supportLevel
-            steps.cmd("stebi transform --remove_support $supportLevel --src $config.srcDir $genericIssueFile")
+            steps.cmd("stebi transform --remove_support $supportLevel --src $srcDir $genericIssueFile")
         }
 
         steps.archiveArtifacts(RESULT_FILE)

vars/pipeline1C.groovy

@@ -121,15 +121,28 @@ void call() {
             stage('Проверка качества') {
                 parallel {
                     stage('EDT контроль') {
-                        agent {
-                            label 'edt'
-                        }
                         when {
                             beforeAgent true
                             expression { config.stageFlags.edtValidate }
                         }
-                        steps {
-                            edtValidate config
+                        stages {
+                            stage('Валидация EDT') {
+                                agent {
+                                    label 'edt'
+                                }
+                                steps {
+                                    edtValidate config
+                                }
+                            }
+
+                            stage('Трансформация результатов') {
+                                agent {
+                                    label 'oscript'
+                                }
+                                steps {
+                                    transform config
+                                }
+                            }
                         }
                     }
 
@@ -176,19 +189,6 @@ void call() {
                 }
             }
 
-            stage('Трансформация результатов') {
-                agent {
-                    label 'oscript'
-                }
-                when {
-                    beforeAgent true
-                    expression { config.stageFlags.edtValidate }
-                }
-                steps {
-                    transform config
-                }
-            }
-
             stage('SonarQube') {
                 agent {
                     label 'sonar'