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

simplify and fix

Browse Source
This commit is contained in:
Dima
2024-03-19 16:52:39 +03:00
parent 63f065062d
commit a2ff504393
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ class LoadExtensions implements Serializable {
loadCommand += executeParameter loadCommand += executeParameter
loadCommand += ' --ibconnection "/F./build/ib"' loadCommand += ' --ibconnection "/F./build/ib"'
String vrunnerSettings = getVrunnerSettings(this.config, this.stageName) String vrunnerSettings = getVrunnerSettings()
if (steps.fileExists(vrunnerSettings)) { if (steps.fileExists(vrunnerSettings)) {
loadCommand += " --settings $vrunnerSettings" loadCommand += " --settings $vrunnerSettings"
} }
@@ -73,11 +73,15 @@ class LoadExtensions implements Serializable {
} }
} }
private static String getVrunnerSettings(JobConfiguration jobConfiguration, String stageName) { private static String getVrunnerSettings() {
String optionsName = "${stageName.toLowerCase()}Options" if (!this.stageName) {
return ""
}
def optionsInstance = jobConfiguration."$optionsName" String optionsName = "${this.stageName.toLowerCase()}Options"
def optionsInstance = this.config."$optionsName"
if (optionsInstance) { if (optionsInstance) {
return optionsInstance."vrunnerSettings" return optionsInstance."vrunnerSettings"