jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-02-12 14:57:15 +02:00
Code Issues Releases Activity

Формат EDT блокирует возможность инициализации ИБ из хранилища (#51)

Browse Source 
Co-authored-by: kuzja086 <kozs@tlink.ru>
This commit is contained in:
kuzja086 2021-11-17 10:48:06 +05:00 committed by GitHub
parent 13e04b994f
commit 6ffb938258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/schema.json
View File

@ -17,7 +17,7 @@
},
"defaultBranch" : {
"type" : "string",
"description" : "Имя ветки по умолчанию"
"description" : "Имя ветки по умолчанию. Значение по умолчанию - main."
},
"secrets" : {
"type" : "object",

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

@ -78,8 +78,7 @@ class JobConfiguration implements Serializable {
String branchName = env.BRANCH_NAME;
def initMethod = initInfobaseOptions.initMethod
return sourceFormat == SourceFormat.EDT ||
(initMethod == InitInfobaseMethod.FROM_SOURCE) ||
return (initMethod == InitInfobaseMethod.FROM_SOURCE) ||
(initMethod == InitInfobaseMethod.DEFAULT_BRANCH_FROM_STORAGE && branchName != defaultBranch)
}
}

2
vars/pipeline1C.groovy
View File

@ -56,7 +56,7 @@ void call() {
}
when {
beforeAgent true
expression { config.stageFlags.needInfobase() && config.sourceFormat == SourceFormat.EDT }
expression { config.stageFlags.needInfobase() && config.infobaseFromFiles() && config.sourceFormat == SourceFormat.EDT }
}
steps {
edtToDesignerFormatTransformation config