More Jenkinsfile test

2018-03-27 16:17:13 +02:00
parent 17593b6a97
commit b05f143f93
1 changed files with 12 additions and 14 deletions
--- a/26
+++ b/26
@ -20,20 +20,18 @@ pipeline {
 				parallel (
 					'open-source-search-engine': {
 						dir("${env.GB_DIR}") {
-							checkout([
-								$class: 'GitSCMSource',
-								branches: scm.branches,
-								doGenerateSubmoduleConfigurations: false,
-								extensions: scm.extensions +
-								            [[$class: 'SubmoduleOption',
-								              disableSubmodules: false,
-								              parentCredentials: false,
-								              recursiveSubmodules: true,
-								              reference: '',
-								              trackingSubmodules: false]] +
-								            [[$class: 'CleanBeforeCheckout']],
-								userRemoteConfigs: scm.userRemoteConfigs
-							])
+							checkout resolveScm(
+								source: [
+									$class: 'GitSCMSource',
+									traits: [
+										[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'],
+										[$class: 'CleanBeforeCheckoutTrait'],
+										[$class: 'DisableStatusUpdateTrait'],
+										[$class: 'SubmoduleOptionTrait', recursiveSubmodules: true]
+									]
+								],
+								targets: ["${env.BRANCH_NAME}"]
+							)
 						}
 					},
 					'pywebtest': {