krak/jenkins-lib
1
0
Fork 0
forked from jenkins/jenkins-lib
Code Activity

Исправлено получение путей к файлам проекта edt.

Browse Source 
В случае когда ОС мастера и агента отличается
This commit is contained in:
Nikita Fedkin
2023-12-05 21:14:19 +01:00
parent 04888ecac4
commit 8aac6e00d8
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
View File

@@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.Constants
import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.EDT
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
class DesignerToEdtFormatTransformation implements Serializable { class DesignerToEdtFormatTransformation implements Serializable {
@@ -33,8 +34,9 @@ class DesignerToEdtFormatTransformation implements Serializable {
def env = steps.env(); def env = steps.env();
def workspaceDir = "$env.WORKSPACE/$WORKSPACE" def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE")
def configurationRoot = new File(env.WORKSPACE, config.srcDir).getAbsolutePath() def srcDir = config.srcDir
def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
def edtVersionForRing = EDT.ringModule(config) def edtVersionForRing = EDT.ringModule(config)
steps.deleteDir(workspaceDir) steps.deleteDir(workspaceDir)

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

@@ -7,6 +7,7 @@ import ru.pulsar.jenkins.library.configuration.SourceFormat
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.Constants
import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.EDT
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
class EdtToDesignerFormatTransformation implements Serializable { class EdtToDesignerFormatTransformation implements Serializable {
@@ -35,9 +36,9 @@ class EdtToDesignerFormatTransformation implements Serializable {
def env = steps.env(); def env = steps.env();
def srcDir = config.srcDir def srcDir = config.srcDir
def projectDir = new File("$env.WORKSPACE/$srcDir").getCanonicalPath() def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
def workspaceDir = "$env.WORKSPACE/$WORKSPACE" def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE")
def configurationRoot = "$env.WORKSPACE/$CONFIGURATION_DIR" def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR")
def edtVersionForRing = EDT.ringModule(config) def edtVersionForRing = EDT.ringModule(config)
steps.deleteDir(workspaceDir) steps.deleteDir(workspaceDir)

4
src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy
View File

@@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.SourceFormat
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Constants import ru.pulsar.jenkins.library.utils.Constants
import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.EDT
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
class EdtValidate implements Serializable { class EdtValidate implements Serializable {
@@ -40,7 +41,8 @@ class EdtValidate implements Serializable {
projectList = "--project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME" projectList = "--project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME"
} else { } else {
String projectDir = new File("$env.WORKSPACE/$config.srcDir").getCanonicalPath() def srcDir = config.srcDir
def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
projectList = "--project-list \"$projectDir\"" projectList = "--project-list \"$projectDir\""
} }