<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9688">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: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk<br><br>Change-Id: I652f4a0ea5107c778e27a78bccb67b18b0c4e087<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/periodics-daily.jenkinsfile<br>M tests/CI/ref_debug.jenkinsfile<br>M tests/CI/unittests.jenkinsfile<br>4 files changed, 8 insertions(+), 8 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 a0580e5..82a39a3 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -122,7 +122,7 @@</span><br><span> img.inside(dockerOptions + " --name ${bt}-build") {</span><br><span> echo 'Building..'</span><br><span> env.CCACHE_DIR = "/srv/cache/ccache"</span><br><span style="color: hsl(0, 100%, 40%);">- sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,</span><br><span> artifacts: "${outputdir}/*"</span><br><span>@@ -148,7 +148,7 @@</span><br><span> img.inside("${dockerOptions} --name ${bt}-${groupName}") {</span><br><span> </span><br><span> lock("${JOB_NAME}.${NODE_NAME}.installer") {</span><br><span style="color: hsl(0, 100%, 40%);">- sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"</span><br><span> }</span><br><span> </span><br><span> sh "sudo rm -rf ${groupDir} || : "</span><br><span>diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile</span><br><span>index ea08e38..60b0ede 100644</span><br><span>--- a/tests/CI/periodics-daily.jenkinsfile</span><br><span>+++ b/tests/CI/periodics-daily.jenkinsfile</span><br><span>@@ -47,14 +47,14 @@</span><br><span> stage ("Build") {</span><br><span> echo 'Building..'</span><br><span> env.CCACHE_DIR = "/srv/cache/ccache"</span><br><span style="color: hsl(0, 100%, 40%);">- sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,</span><br><span> artifacts: "${outputdir}/*"</span><br><span> }</span><br><span> stage ("Docs") {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"</span><br><span> </span><br><span> def docUrl = env.GIT_URL.replaceAll(/\/[^\/]+$/, "/publish-docs")</span><br><span> checkout scm: [$class: 'GitSCM',</span><br><span>diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile</span><br><span>index f44c577..7ef40e7 100644</span><br><span>--- a/tests/CI/ref_debug.jenkinsfile</span><br><span>+++ b/tests/CI/ref_debug.jenkinsfile</span><br><span>@@ -47,7 +47,7 @@</span><br><span> img.inside(dockerOptions + " --name ${bt}-build") {</span><br><span> echo 'Building..'</span><br><span> env.CCACHE_DIR = "/srv/cache/ccache"</span><br><span style="color: hsl(0, 100%, 40%);">- sh "./tests/CI/buildAsterisk.sh --ref-debug --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "./tests/CI/buildAsterisk.sh --ref-debug --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,</span><br><span> artifacts: "${outputdir}/*"</span><br><span>@@ -73,7 +73,7 @@</span><br><span> img.inside("${dockerOptions} --name ${bt}-${groupName}") {</span><br><span> </span><br><span> lock("${JOB_NAME}.${NODE_NAME}.installer") {</span><br><span style="color: hsl(0, 100%, 40%);">- sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"</span><br><span> }</span><br><span> </span><br><span> sh "sudo rm -rf ${groupDir} || : "</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index bfe56e3..438213b 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -124,7 +124,7 @@</span><br><span> stage ('Build') {</span><br><span> echo 'Building..'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "./tests/CI/buildAsterisk.sh --branch-name=${BRANCH_NAME} --output-dir=${outputdir} --cache-dir=/srv/cache"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: false,</span><br><span> artifacts: "${outputdir}/*"</span><br><span>@@ -134,7 +134,7 @@</span><br><span> def outputfile = "${outputdir}/unittests-results.xml"</span><br><span> def testcmd = "test execute all"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo ./tests/CI/installAsterisk.sh --branch-name=${BRANCH_NAME} --user-group=jenkins:users"</span><br><span> </span><br><span> sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --unittest-command='${testcmd}'"</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9688">change 9688</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/9688"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I652f4a0ea5107c778e27a78bccb67b18b0c4e087 </div>
<div style="display:none"> Gerrit-Change-Number: 9688 </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>