[Asterisk-code-review] CI: Add pre-build merge back in as RECURSIVE (asterisk[master])

[George Joseph]

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/9486


Change subject: CI: Add pre-build merge back in as RECURSIVE
......................................................................

CI: Add pre-build merge back in as RECURSIVE

Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8
---
M tests/CI/gates.jenkinsfile
M tests/CI/unittests.jenkinsfile
2 files changed, 4 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/86/9486/1

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 8e3f6a6..f4ec711 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -81,6 +81,8 @@
 							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 ad95d0b..d549dbf 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -82,6 +82,8 @@
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
 								[$class: 'CleanBeforeCheckout'],
+								[$class: 'PreBuildMerge', options: [
+									mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
 								[$class: 'CloneOption',
 									honorRefspec: true,
 									noTags: true,

-- 
To view, visit https://gerrit.asterisk.org/9486
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8
Gerrit-Change-Number: 9486
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180717/3b3021d3/attachment-0001.html>