<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9497">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins2: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Fix merge strategy<br><br>Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/unittests.jenkinsfile<br>2 files changed, 12 insertions(+), 2 deletions(-)<br><br></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 f4ec711..9dc7308 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -80,15 +80,20 @@</span><br><span>                                           checkout scm: [$class: 'GitSCM',</span><br><span>                                                     branches: [[name: env.GERRIT_BRANCH ]],</span><br><span>                                                      extensions: [</span><br><span style="color: hsl(120, 100%, 40%);">+                                                         [$class: 'ScmName', name: 'gerrit-public'],</span><br><span>                                                          [$class: 'CleanBeforeCheckout'],</span><br><span>                                                             [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                    mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                 mergeRemote: 'gerrit-public',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                 fastForwardMode: 'NO_FF',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                     mergeStrategy: 'RECURSIVE',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                   mergeTarget: env.GERRIT_BRANCH]],</span><br><span>                                                            [$class: 'CloneOption',</span><br><span>                                                                      honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span>                                                                        depth: 10,</span><br><span>                                                                   shallow: true</span><br><span>                                                                ],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                            [$class: 'PruneStaleBranch'],</span><br><span>                                                                [$class: 'BuildChooserSetting',</span><br><span>                                                                      buildChooser: [$class: 'GerritTriggerBuildChooser']</span><br><span>                                                          ]</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index d549dbf..767ff94 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -81,15 +81,20 @@</span><br><span>                                                 checkout scm: [$class: 'GitSCM',</span><br><span>                                                     branches: [[name: env.GERRIT_BRANCH ]],</span><br><span>                                                      extensions: [</span><br><span style="color: hsl(120, 100%, 40%);">+                                                         [$class: 'ScmName', name: 'gerrit-public'],</span><br><span>                                                          [$class: 'CleanBeforeCheckout'],</span><br><span>                                                             [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                    mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                 mergeRemote: 'gerrit-public',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                 fastForwardMode: 'NO_FF',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                     mergeStrategy: 'RECURSIVE',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                   mergeTarget: env.GERRIT_BRANCH]],</span><br><span>                                                            [$class: 'CloneOption',</span><br><span>                                                                      honorRefspec: true,</span><br><span>                                                                  noTags: true,</span><br><span>                                                                        depth: 10,</span><br><span>                                                                   shallow: true</span><br><span>                                                                ],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                            [$class: 'PruneStaleBranch'],</span><br><span>                                                                [$class: 'BuildChooserSetting',</span><br><span>                                                                      buildChooser: [$class: 'GerritTriggerBuildChooser']</span><br><span>                                                          ]</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9497">change 9497</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/9497"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e </div>
<div style="display:none"> Gerrit-Change-Number: 9497 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>