From: George Joseph <gjoseph@digium.com>
Date: Tue, 17 Jul 2018 15:15:58 +0000 (-0600)
Subject: CI: Add pre-build merge back in as RECURSIVE
X-Git-Tag: 15.6.0-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e4e384ea48271d8949cb6645fdd196e2898b1a1;p=thirdparty%2Fasterisk.git

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 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,