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

Методы получения имени агента для 1с и для едт внесены в класс JobConfiguration

Browse Source
This commit is contained in:
ivanmolodec
2022-05-16 11:15:33 +03:00
parent 8c5b53a7a8
commit 6cf6aee472
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
View File

@@ -94,4 +94,16 @@ class JobConfiguration implements Serializable {
return (initMethod == InitInfoBaseMethod.FROM_SOURCE) ||
(initMethod == InitInfoBaseMethod.DEFAULT_BRANCH_FROM_STORAGE && branchName != defaultBranch)
}
String v8version() {
return v8version
}
String edtVersionForRing() {
String edtVersionForRing = "edt"
if (edtVersion != '') {
edtVersionForRing += "@" + edtVersion
}
return edtVersionForRing
}
}

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

@@ -34,17 +34,13 @@ class DesignerToEdtFormatTransformation implements Serializable {
def workspaceDir = "$env.WORKSPACE/$WORKSPACE"
def configurationRoot = new File(env.WORKSPACE, config.srcDir).getAbsolutePath()
def edtVersionForRing = config.edtVersionForRing()
steps.deleteDir(workspaceDir)
Logger.println("Конвертация исходников из формата конфигуратора в формат EDT")
String edtVersion = "edt"
if (config.edtVersion != '') {
edtVersion += "@" + config.edtVersion
}
def ringCommand = "ring $edtVersion workspace import --configuration-files \"$configurationRoot\" --project-name $PROJECT_NAME --workspace-location \"$workspaceDir\""
def ringCommand = "ring $edtVersionForRing workspace import --configuration-files \"$configurationRoot\" --project-name $PROJECT_NAME --workspace-location \"$workspaceDir\""
def ringOpts = [Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) {

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

@@ -37,18 +37,14 @@ class EdtToDesignerFormatTransformation implements Serializable {
def projectDir = new File("$env.WORKSPACE/$srcDir").getCanonicalPath()
def workspaceDir = "$env.WORKSPACE/$WORKSPACE"
def configurationRoot = "$env.WORKSPACE/$CONFIGURATION_DIR"
def edtVersionForRing = config.edtVersionForRing()
steps.deleteDir(workspaceDir)
steps.deleteDir(configurationRoot)
Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")
String edtVersion = "edt"
if (config.edtVersion != '') {
edtVersion += "@" + config.edtVersion
}
def ringCommand = "ring $edtVersion workspace export --workspace-location \"$workspaceDir\" --project \"$projectDir\" --configuration-files \"$configurationRoot\""
def ringCommand = "ring $edtVersionForRing workspace export --workspace-location \"$workspaceDir\" --project \"$projectDir\" --configuration-files \"$configurationRoot\""
def ringOpts = [Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) {

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

@@ -44,15 +44,11 @@ class EdtValidate implements Serializable {
}
def resultFile = "$env.WORKSPACE/$RESULT_FILE"
def edtVersionForRing = config.edtVersionForRing()
Logger.println("Выполнение валидации EDT")
String edtVersion = "edt"
if (config.edtVersion != '') {
edtVersion += "@" + config.edtVersion
}
def ringCommand = "ring $edtVersion workspace validate --workspace-location \"$workspaceLocation\" --file \"$resultFile\" $projectList"
def ringCommand = "ring $edtVersionForRing workspace validate --workspace-location \"$workspaceLocation\" --file \"$resultFile\" $projectList"
def ringOpts = [Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) {
steps.catchError {

7
vars/pipeline1C.groovy
View File

@@ -38,11 +38,8 @@ void call() {
steps {
script {
config = jobConfiguration() as JobConfiguration
agent1C = config.v8version
agentEdt = "edt"
if (config.edtVersion != '') {
agentEdt += "@" + config.edtVersion
}
agent1C = config.v8version()
agentEdt = config.edtVersionForRing()
}
}
}