CI: Add pre-build merge back in as RECURSIVE

Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8
8 years ago · fa333dedd0
parent 2ce66f6a66
commit fa333dedd0
2 changed files with 4 additions and 0 deletions
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@ -81,6 +81,8 @@ pipeline {
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
 								[$class: 'CleanBeforeCheckout'],
+								[$class: 'PreBuildMerge', options: [
+									mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
 								[$class: 'CloneOption',
 									honorRefspec: true,
 									noTags: true,
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@ -82,6 +82,8 @@ pipeline {
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
 								[$class: 'CleanBeforeCheckout'],
+								[$class: 'PreBuildMerge', options: [
+									mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
 								[$class: 'CloneOption',
 									honorRefspec: true,
 									noTags: true,