<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9481">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Remove pre-build merge from gates and checks<br><br>Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/unittests.jenkinsfile<br>2 files changed, 2 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/81/9481/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 b25b8eb..8e3f6a6 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -81,11 +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(0, 100%, 40%);">-                                                                [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                    mergeRemote: env.GERRIT_NAME,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                   mergeTarget: env.GERRIT_BRANCH ]</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                ],</span><br><span>                                                           [$class: 'CloneOption',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                       honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span>                                                                        depth: 10,</span><br><span>                                                                   shallow: true</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index a601697..ad95d0b 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -82,11 +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(0, 100%, 40%);">-                                                                [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                    mergeRemote: env.GERRIT_NAME,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                   mergeTarget: env.GERRIT_BRANCH ]</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                ],</span><br><span>                                                           [$class: 'CloneOption',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                       honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span>                                                                        depth: 10,</span><br><span>                                                                   shallow: true</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9481">change 9481</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/9481"/><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: Ibc151f63dcec4db847915c2f3cbe5b467dd59574 </div>
<div style="display:none"> Gerrit-Change-Number: 9481 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>