diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile index 8e3f6a63c8..f4ec711f33 100644 --- 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, diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile index ad95d0bd56..d549dbfdc4 100644 --- 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,