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

Merge branch 'release/v0.3.1'

Browse Source
This commit is contained in:
Nikita Gryzlov
2021-06-16 10:32:07 +03:00
parent d39e9d1cf8 3cb369194b
commit 4202161f62
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
View File

@@ -7,8 +7,6 @@ import org.apache.commons.beanutils.BeanUtils
import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import javax.annotation.CheckForNull
class ConfigurationReader implements Serializable { class ConfigurationReader implements Serializable {
private static ObjectMapper mapper private static ObjectMapper mapper
@@ -78,7 +76,7 @@ class ConfigurationReader implements Serializable {
} }
@NonCPS @NonCPS
private static void mergeInitInfobaseOptions(InitInfobaseOptions baseObject, @CheckForNull InitInfobaseOptions objectToMerge) { private static void mergeInitInfobaseOptions(InitInfobaseOptions baseObject, InitInfobaseOptions objectToMerge) {
if (objectToMerge == null || objectToMerge.additionalInitializationSteps == null) { if (objectToMerge == null || objectToMerge.additionalInitializationSteps == null) {
return return
} }
@@ -86,7 +84,7 @@ class ConfigurationReader implements Serializable {
} }
@NonCPS @NonCPS
private static void mergeBddOptions(BddOptions baseObject, @CheckForNull BddOptions objectToMerge) { private static void mergeBddOptions(BddOptions baseObject, BddOptions objectToMerge) {
if (objectToMerge == null || objectToMerge.vrunnerSteps == null) { if (objectToMerge == null || objectToMerge.vrunnerSteps == null) {
return return
} }

2
vars/cmd.groovy
View File

@@ -4,6 +4,6 @@ import ru.pulsar.jenkins.library.ioc.ContextRegistry
int call(String script, boolean returnStatus = false) { int call(String script, boolean returnStatus = false) {
ContextRegistry.registerDefaultContext(this) ContextRegistry.registerDefaultContext(this)
def cmd = new Cmd(script, returnStatus) Cmd cmd = new Cmd(script, returnStatus)
return cmd.run() return cmd.run()
} }

3
vars/pipeline1C.groovy
View File

@@ -1,3 +1,4 @@
/* groovylint-disable NestedBlockDepth */
import groovy.transform.Field import groovy.transform.Field
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
@@ -7,7 +8,7 @@ import java.util.concurrent.TimeUnit
JobConfiguration config JobConfiguration config
@Field @Field
def agent1C String agent1C
void call() { void call() {