CI: Add pre-build merge back in as RECURSIVE

Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 8e3f6a63c8d59970a185defdcae39d7e75abdd52..f4ec711f337bcf7d7072b68116aa46fe12f060b0 100644 (file)
--- 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 ad95d0bd56f4920390519eb2051a0a6027fc717d..d549dbfdc4a457506912839f6308904ea1afd922 100644 (file)
--- 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,