diff --git a/resources/schema.json b/resources/schema.json index cbd7157..0532694 100644 --- a/resources/schema.json +++ b/resources/schema.json @@ -17,7 +17,7 @@ }, "defaultBranch" : { "type" : "string", - "description" : "Имя ветки по умолчанию" + "description" : "Имя ветки по умолчанию. Значение по умолчанию - main." }, "secrets" : { "type" : "object", diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy index f623035..4689a6f 100644 --- a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy @@ -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) } } \ No newline at end of file diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index 7f5222d..efab2c4 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -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