jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

Вынос templateDBLoaded на уровень конфигурации

Browse Source
This commit is contained in:
Nikita Fedkin
2024-08-29 23:07:14 +02:00
parent 5c5b2842b2
commit a656789870
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy
View File

@@ -81,8 +81,4 @@ class InitInfoBaseOptions implements Serializable {
", extensions=" + extensions +
'}'
}
boolean templateDBLoaded() {
return templateDBPath != null && !templateDBPath.isEmpty()
}
}

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

@@ -115,6 +115,10 @@ class JobConfiguration implements Serializable {
}
}
boolean templateDBLoaded() {
return initInfoBaseOptions.templateDBPath != null && !initInfoBaseOptions.templateDBPath.isEmpty()
}
String v8AgentLabel() {
return v8version
}

2
src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy
View File

@@ -47,7 +47,7 @@ class InitFromFiles implements Serializable {
def options = config.initInfoBaseOptions
String vrunnerSettings = options.vrunnerSettings
if (options.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
command += " --settings $vrunnerSettings"
}

2
src/ru/pulsar/jenkins/library/steps/InitFromStorage.groovy
View File

@@ -60,7 +60,7 @@ class InitFromStorage implements Serializable {
def options = config.initInfoBaseOptions
String vrunnerSettings = options.vrunnerSettings
if (options.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
command += " --settings $vrunnerSettings"
}

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

@@ -36,11 +36,11 @@ class InitInfoBase implements Serializable {
def options = config.initInfoBaseOptions
String settingsIncrement = ''
String vrunnerSettings = options.vrunnerSettings
if (options.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) {
settingsIncrement = " --settings $vrunnerSettings"
}
if (config.initInfoBaseOptions.runMigration) {
if (options.runMigration) {
Logger.println("Запуск миграции ИБ")
String command = vrunnerPath + ' run --command "ЗапуститьОбновлениеИнформационнойБазы;ЗавершитьРаботуСистемы;" --execute '
@@ -61,7 +61,7 @@ class InitInfoBase implements Serializable {
}
steps.catchError {
if (config.initInfoBaseOptions.additionalInitializationSteps.length == 0) {
if (options.additionalInitializationSteps.length == 0) {
FileWrapper[] files = steps.findFiles("tools/vrunner.init*.json")
files = files.sort new OrderBy( { it.name })
files.each {
@@ -69,7 +69,7 @@ class InitInfoBase implements Serializable {
VRunner.exec("$vrunnerPath vanessa --settings ${it.path} --ibconnection \"/F./build/ib\"")
}
} else {
config.initInfoBaseOptions.additionalInitializationSteps.each {
options.additionalInitializationSteps.each {
Logger.println("Первичная инициализация командой ${it}")
VRunner.exec("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"${settingsIncrement}")
}

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

@@ -91,10 +91,10 @@ class LoadExtensions implements Serializable {
}
// For InitInfoBaseOptions, return the vrunner settings path only if the database is loaded from an archive
if (optionsInstance instanceof InitInfoBaseOptions && !optionsInstance.templateDBLoaded()) {
if (optionsInstance instanceof InitInfoBaseOptions && !config.templateDBLoaded()) {
return ""
}
return optionsInstance."vrunnerSettings"
return optionsInstance.vrunnerSettings
}
}