diff --git a/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy b/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy index 07cfafec..a62c9909 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy @@ -35,9 +35,7 @@ class TestJenkinsFile extends BaseRegressionTest { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/groovy/com/lesfurets/jenkins/TestParallelJob.groovy b/src/test/groovy/com/lesfurets/jenkins/TestParallelJob.groovy index 676c3f20..f1f51ff0 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestParallelJob.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestParallelJob.groovy @@ -15,9 +15,7 @@ class TestParallelJob extends BasePipelineTest { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/groovy/com/lesfurets/jenkins/TestParallelJobCPS.groovy b/src/test/groovy/com/lesfurets/jenkins/TestParallelJobCPS.groovy index 1f8fe682..715654fb 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestParallelJobCPS.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestParallelJobCPS.groovy @@ -16,9 +16,7 @@ class TestParallelJobCPS extends BasePipelineTestCPS { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/groovy/com/lesfurets/jenkins/TestRegression.groovy b/src/test/groovy/com/lesfurets/jenkins/TestRegression.groovy index 2bd97b01..6cf56887 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestRegression.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestRegression.groovy @@ -17,9 +17,7 @@ class TestRegression extends BaseRegressionTestCPS { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/groovy/com/lesfurets/jenkins/TestSerialization.groovy b/src/test/groovy/com/lesfurets/jenkins/TestSerialization.groovy index ea4730dc..3e558643 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestSerialization.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestSerialization.groovy @@ -16,9 +16,7 @@ class TestSerialization extends BasePipelineTest { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/groovy/com/lesfurets/jenkins/TestSerializationCPS.groovy b/src/test/groovy/com/lesfurets/jenkins/TestSerializationCPS.groovy index 9ebe4343..5abe8561 100644 --- a/src/test/groovy/com/lesfurets/jenkins/TestSerializationCPS.groovy +++ b/src/test/groovy/com/lesfurets/jenkins/TestSerializationCPS.groovy @@ -18,9 +18,7 @@ class TestSerializationCPS extends BasePipelineTestCPS { binding.setVariable('scm', [ $class : 'GitSCM', branches : [[name: scmBranch]], - doGenerateSubmoduleConfigurations: false, extensions : [], - submoduleCfg : [], userRemoteConfigs : [[ credentialsId: 'gitlab_git_ssh', url : 'github.com/lesfurets/JenkinsPipelineUnit.git' diff --git a/src/test/resources/callstacks/TestJenkinsFile_develop.txt b/src/test/resources/callstacks/TestJenkinsFile_develop.txt index cb546567..08d877e9 100644 --- a/src/test/resources/callstacks/TestJenkinsFile_develop.txt +++ b/src/test/resources/callstacks/TestJenkinsFile_develop.txt @@ -1,7 +1,7 @@ Jenkinsfile.run() Jenkinsfile.stage(Build, groovy.lang.Closure) Jenkinsfile.node(groovy.lang.Closure) - Jenkinsfile.checkout({$class=GitSCM, branches=[{name=develop}], doGenerateSubmoduleConfigurations=false, extensions=[], submoduleCfg=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) + Jenkinsfile.checkout({$class=GitSCM, branches=[{name=develop}], extensions=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) Jenkinsfile.echo(Running mvn verify on branch develop) Jenkinsfile.sh(mkdir -p ~/.gnupg) Jenkinsfile.file({credentialsId=gpg-pubring, variable=GPG_PUB_RING}) diff --git a/src/test/resources/callstacks/TestJenkinsFile_feature_.txt b/src/test/resources/callstacks/TestJenkinsFile_feature_.txt index ac9697c0..f3b35288 100644 --- a/src/test/resources/callstacks/TestJenkinsFile_feature_.txt +++ b/src/test/resources/callstacks/TestJenkinsFile_feature_.txt @@ -1,7 +1,7 @@ Jenkinsfile.run() Jenkinsfile.stage(Build, groovy.lang.Closure) Jenkinsfile.node(groovy.lang.Closure) - Jenkinsfile.checkout({$class=GitSCM, branches=[{name=feature_}], doGenerateSubmoduleConfigurations=false, extensions=[], submoduleCfg=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) + Jenkinsfile.checkout({$class=GitSCM, branches=[{name=feature_}], extensions=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) Jenkinsfile.echo(Running mvn verify on branch feature_) Jenkinsfile.sh(mkdir -p ~/.gnupg) Jenkinsfile.file({credentialsId=gpg-pubring, variable=GPG_PUB_RING}) diff --git a/src/test/resources/callstacks/TestJenkinsFile_master.txt b/src/test/resources/callstacks/TestJenkinsFile_master.txt index f905370e..0c6b262e 100644 --- a/src/test/resources/callstacks/TestJenkinsFile_master.txt +++ b/src/test/resources/callstacks/TestJenkinsFile_master.txt @@ -1,7 +1,7 @@ Jenkinsfile.run() Jenkinsfile.stage(Build, groovy.lang.Closure) Jenkinsfile.node(groovy.lang.Closure) - Jenkinsfile.checkout({$class=GitSCM, branches=[{name=master}], doGenerateSubmoduleConfigurations=false, extensions=[], submoduleCfg=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) + Jenkinsfile.checkout({$class=GitSCM, branches=[{name=master}], extensions=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) Jenkinsfile.echo(Running mvn deploy on branch master) Jenkinsfile.sh(mkdir -p ~/.gnupg) Jenkinsfile.file({credentialsId=gpg-pubring, variable=GPG_PUB_RING}) diff --git a/src/test/resources/callstacks/TestRegression_example.txt b/src/test/resources/callstacks/TestRegression_example.txt index 8e88dcd1..76dbd554 100644 --- a/src/test/resources/callstacks/TestRegression_example.txt +++ b/src/test/resources/callstacks/TestRegression_example.txt @@ -7,7 +7,7 @@ exampleJob.load(src/test/jenkins/lib/properties.jenkins) properties.run() exampleJob.stage(Checkout, groovy.lang.Closure) - exampleJob.checkout({$class=GitSCM, branches=[{name=feature_test}], doGenerateSubmoduleConfigurations=false, extensions=[], submoduleCfg=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) + exampleJob.checkout({$class=GitSCM, branches=[{name=feature_test}], extensions=[], userRemoteConfigs=[{credentialsId=gitlab_git_ssh, url=github.com/lesfurets/JenkinsPipelineUnit.git}]}) utils.currentRevision() utils.sh({returnStdout=true, script=git rev-parse HEAD}) exampleJob.gitlabBuilds({builds=[build, test]}, groovy.lang.Closure)