<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9488">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Add pre-build merge back in as RECURSIVE<br><br>Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/unittests.jenkinsfile<br>2 files changed, 4 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/88/9488/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile</span><br><span>index 8e3f6a6..f4ec711 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -81,6 +81,8 @@</span><br><span>                                                     branches: [[name: env.GERRIT_BRANCH ]],</span><br><span>                                                      extensions: [</span><br><span>                                                                [$class: 'CleanBeforeCheckout'],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                              [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                  mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],</span><br><span>                                                                [$class: 'CloneOption',</span><br><span>                                                                      honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index ad95d0b..d549dbf 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -82,6 +82,8 @@</span><br><span>                                                       branches: [[name: env.GERRIT_BRANCH ]],</span><br><span>                                                      extensions: [</span><br><span>                                                                [$class: 'CleanBeforeCheckout'],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                              [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                  mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],</span><br><span>                                                                [$class: 'CloneOption',</span><br><span>                                                                      honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9488">change 9488</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9488"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: certified/13.21 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8 </div>
<div style="display:none"> Gerrit-Change-Number: 9488 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>