jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2024-11-28 09:33:03 +02:00
Code Issues Releases Activity

Передача флага --nocacheuse для VRunner

Browse Source
This commit is contained in:
Nikita Gryzlov 2021-11-08 20:29:24 +03:00
parent b91748be9a
commit df5e4b766d
No known key found for this signature in database
GPG Key ID: C3CAA2980494E7E6
7 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,3 +5,6 @@ bin/
lib/
*.iml
.classpath
.project
.settings/

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

@ -34,7 +34,7 @@ class Bdd implements Serializable {
config.bddOptions.vrunnerSteps.each {
Logger.println("Шаг запуска сценариев командой ${it}")
String vrunnerPath = VRunner.getVRunnerPath();
steps.cmd("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"")
VRunner.exec("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"")
}
}
}

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

@ -44,6 +44,6 @@ class InitFromFiles implements Serializable {
Logger.println("Выполнение загрузки конфигурации из файлов")
String vrunnerPath = VRunner.getVRunnerPath();
def initCommand = "$vrunnerPath init-dev --src $srcDir --ibconnection \"/F./build/ib\""
steps.cmd(initCommand)
VRunner.exec(initCommand)
}
}

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

@ -57,7 +57,7 @@ class InitFromStorage implements Serializable {
)
]) {
String vrunnerPath = VRunner.getVRunnerPath()
steps.cmd "$vrunnerPath init-dev --storage $storageVersionParameter --ibconnection \"/F./build/ib\""
VRunner.exec "$vrunnerPath init-dev --storage $storageVersionParameter --ibconnection \"/F./build/ib\""
}
}

6
src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy
View File

@ -37,7 +37,7 @@ class InitInfobase implements Serializable {
// Запуск миграции
steps.catchError {
steps.cmd(vrunnerPath + ' run --command "ЗапуститьОбновлениеИнформационнойБазы;ЗавершитьРаботуСистемы;" --execute \\$runnerRoot/epf/ЗакрытьПредприятие.epf --ibconnection "/F./build/ib"')
VRunner.exec(vrunnerPath + ' run --command "ЗапуститьОбновлениеИнформационнойБазы;ЗавершитьРаботуСистемы;" --execute \\$runnerRoot/epf/ЗакрытьПредприятие.epf --ibconnection "/F./build/ib"')
}
} else {
Logger.println("Шаг миграции ИБ выключен")
@ -49,12 +49,12 @@ class InitInfobase implements Serializable {
files = files.sort new OrderBy( { it.name })
files.each {
Logger.println("Первичная инициализация файлом ${it.path}")
steps.cmd("$vrunnerPath vanessa --settings ${it.path} --ibconnection \"/F./build/ib\"")
VRunner.exec("$vrunnerPath vanessa --settings ${it.path} --ibconnection \"/F./build/ib\"")
}
} else {
config.initInfobaseOptions.additionalInitializationSteps.each {
Logger.println("Первичная инициализация командой ${it}")
steps.cmd("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"")
VRunner.exec("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"")
}
}
}

10
src/ru/pulsar/jenkins/library/utils/VRunner.groovy
View File

@ -5,6 +5,8 @@ import ru.pulsar.jenkins.library.ioc.ContextRegistry
class VRunner {
static final String DEFAULT_VRUNNER_OPTS = "RUNNER_NOCACHEUSE=1"
static String getVRunnerPath() {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
@ -17,4 +19,12 @@ class VRunner {
return vrunnerPath;
}
static int exec(String command, boolean returnStatus = false) {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
steps.withEnv([DEFAULT_VRUNNER_OPTS]) {
return steps.cmd(command, returnStatus)
} as int
}
}

2
vars/syntaxCheck.groovy
View File

@ -56,7 +56,7 @@ def call(JobConfiguration config) {
}
// Запуск синтакс-проверки
cmd(command, true)
VRunner.exec(command, true)
junit allowEmptyResults: true, testResults: FileUtils.getLocalPath(pathToJUnitReport)