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

Рефакторинг

Browse Source
This commit is contained in:
kuzja086
2021-09-08 17:19:38 +05:00
parent f0e72e772e 62521d6fa8
commit aa82bd09ec
11 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vars/edtTransform.groovy → vars/designerToEdtFormatTransformation.groovy
View File

@@ -1,10 +1,10 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.steps.EdtTransform
import ru.pulsar.jenkins.library.steps.DesignerToEdtFormatTransformation
def call(JobConfiguration config) {
ContextRegistry.registerDefaultContext(this)
def edtTransform = new EdtTransform(config)
def edtTransform = new DesignerToEdtFormatTransformation(config)
edtTransform.run()
}

4
vars/edtBackTransform.groovy → vars/edtToDesignerFormatTransformation.groovy
View File

@@ -1,10 +1,10 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.steps.EdtBackTransform
import ru.pulsar.jenkins.library.steps.EdtToDesignerFormatTransformation
def call(JobConfiguration config) {
ContextRegistry.registerDefaultContext(this)
def edtBackTransform = new EdtBackTransform(config)
def edtBackTransform = new EdtToDesignerFormatTransformation(config)
edtBackTransform.run()
}

20
vars/pipeline1C.groovy
View File

@@ -55,31 +55,29 @@ void call() {
}
when {
beforeAgent true
expression { config.sourceFormat.infobaseFromFiles() }
expression { config.infobaseFromFiles() }
}
steps {
script{
edtBackTransform config
}
edtToDesignerFormatTransformation config
}
}
stage('Создание ИБ') {
steps {
script{
printLocation()
printLocation()
installLocalDependencies()
installLocalDependencies()
createDir('build/out')
createDir('build/out')
if (config.sourceFormat.infobaseFromFiles()){
script {
if (config.infobaseFromFiles()){
// Создание базы загрузкой из файлов
initFromFiles config
}
else{
// Создание базы загрузкой конфигурации из хранилища
initFromStorage config
initFromStorage config
}
}
}
@@ -114,7 +112,7 @@ void call() {
}
when {
beforeAgent true
expression { config.stageFlags.edtValidate && !config.stageFlags.srcEDT}
expression { config.sourceFormat.DESIGNER && config.stageFlags.edtValidate}
}
steps {
edtTransform config