<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11049">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve; Verified
  Friendly Automation: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Update jenkinsfiles with new Gerrit URLs<br><br>The recent upgrade of Gerrit to 2.16 elimiated referencing a<br>repository in a way the jenkinsfiles were relying on so<br>the URL references were changed to a more consistent and supported<br>format.<br><br>Change-Id: I2e8e3f213b9a96bb1b27665eca4a9a24bc49820e<br>(cherry picked from commit 5ce084579f897096163b4e0c2ed4e8e1a8558cca)<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/unittests.jenkinsfile<br>2 files changed, 6 insertions(+), 6 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 8e24cf3..bc23781 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -79,7 +79,7 @@</span><br><span> </span><br><span>                                        stage ("Checkout") {</span><br><span>                                               sh "sudo chown -R jenkins:users ."  </span><br><span style="color: hsl(0, 100%, 40%);">-                                          env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")</span><br><span style="color: hsl(120, 100%, 40%);">+                                            env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)</span><br><span>                                       </span><br><span>                                             /*</span><br><span>                                            * Jenkins has already automatically checked out the base branch</span><br><span>@@ -102,10 +102,10 @@</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(0, 100%, 40%);">-                                                                   [$class: 'ScmName', name: 'gerrit-public'],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                   [$class: 'ScmName', name: env.GERRIT_NAME],</span><br><span>                                                                  [$class: 'CleanBeforeCheckout'],</span><br><span>                                                                     [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                            mergeRemote: 'gerrit-public',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                         mergeRemote: env.GERRIT_NAME,</span><br><span>                                                                                fastForwardMode: 'NO_FF',</span><br><span>                                                                            mergeStrategy: 'RECURSIVE',</span><br><span>                                                                          mergeTarget: env.GERRIT_BRANCH]],</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index 5043139..3961cf5 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -80,7 +80,7 @@</span><br><span> </span><br><span>                                       stage ("Checkout") {</span><br><span>                                               sh "sudo chown -R jenkins:users ."</span><br><span style="color: hsl(0, 100%, 40%);">-                                            env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")</span><br><span style="color: hsl(120, 100%, 40%);">+                                            env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)</span><br><span> </span><br><span>                                           /*</span><br><span>                                            * Jenkins has already automatically checked out the base branch</span><br><span>@@ -103,10 +103,10 @@</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(0, 100%, 40%);">-                                                                   [$class: 'ScmName', name: 'gerrit-public'],</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                   [$class: 'ScmName', name: env.GERRIT_NAME],</span><br><span>                                                                  [$class: 'CleanBeforeCheckout'],</span><br><span>                                                                     [$class: 'PreBuildMerge', options: [</span><br><span style="color: hsl(0, 100%, 40%);">-                                                                            mergeRemote: 'gerrit-public',</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                         mergeRemote: env.GERRIT_NAME,</span><br><span>                                                                                fastForwardMode: 'NO_FF',</span><br><span>                                                                            mergeStrategy: 'RECURSIVE',</span><br><span>                                                                          mergeTarget: env.GERRIT_BRANCH]],</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11049">change 11049</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/c/asterisk/+/11049"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2e8e3f213b9a96bb1b27665eca4a9a24bc49820e </div>
<div style="display:none"> Gerrit-Change-Number: 11049 </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: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>