<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11595">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Add cleanWs to cleanup steps in jenkinsfiles<br><br>We're at the point where there are enough Jenkins jobs for<br>Asterisk branches than even cleaned checkouts of Asterisk<br>will add up to more disk space than is available on the<br>in-memory workspace mount. Since we archive all relevent<br>artifacts anyway, there's no need to keep the workspace<br>around after the job finishes, whether it succeeds or fails.<br><br>Change-Id: I1cd3b73ebb045a987df0f62526d152a510210c39<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, 11 insertions(+), 15 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 a90b0cf..ca43a60 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -54,7 +54,7 @@</span><br><span> onUnstable: false</span><br><span> ]</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> agent {</span><br><span> /* All of the stages need to be performed on a docker host */</span><br><span> label "swdev-docker"</span><br><span>@@ -78,9 +78,9 @@</span><br><span> manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)</span><br><span> </span><br><span> stage ("Checkout") {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo chown -R jenkins:users ." </span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo chown -R jenkins:users ."</span><br><span> env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * Jenkins has already automatically checked out the base branch</span><br><span> * for this change but we now need to check out the change itself</span><br><span>@@ -191,7 +191,7 @@</span><br><span> }</span><br><span> </span><br><span> sh "sudo rm -rf ${groupDir} || : "</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> withCredentials([usernamePassword(credentialsId: "${JENKINS_GERRIT_CREDS}",</span><br><span> passwordVariable: 'GERRIT_USER_PW', usernameVariable: 'GERRIT_USER_NAME')]) {</span><br><span> checkout scm: [$class: 'GitSCM',</span><br><span>@@ -237,8 +237,7 @@</span><br><span> }</span><br><span> post {</span><br><span> cleanup {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo make distclean >/dev/null 2>&1 || : "</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "</span><br><span style="color: hsl(120, 100%, 40%);">+ cleanWs deleteDirs: true, notFailBuild: true</span><br><span> }</span><br><span> /*</span><br><span> * The Gerrit Trigger will automatically post the "Verified" results back</span><br><span>diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile</span><br><span>index ae5a5f4..5a37bb9 100644</span><br><span>--- a/tests/CI/periodics-daily.jenkinsfile</span><br><span>+++ b/tests/CI/periodics-daily.jenkinsfile</span><br><span>@@ -157,8 +157,7 @@</span><br><span> }</span><br><span> post {</span><br><span> cleanup {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo make distclean >/dev/null 2>&1 || : "</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "</span><br><span style="color: hsl(120, 100%, 40%);">+ cleanWs deleteDirs: true, notFailBuild: true</span><br><span> }</span><br><span> success {</span><br><span> echo "Reporting ${currentBuild.currentResult} Passed"</span><br><span>diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile</span><br><span>index 0e0f49c..9e20600 100644</span><br><span>--- a/tests/CI/ref_debug.jenkinsfile</span><br><span>+++ b/tests/CI/ref_debug.jenkinsfile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> triggers {</span><br><span> cron 'H H(0-4) * * 0'</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> agent {</span><br><span> /* All of the stages need to be performed on a docker host */</span><br><span> label "swdev-docker"</span><br><span>@@ -40,7 +40,7 @@</span><br><span> manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)</span><br><span> </span><br><span> stage ("Checkout") {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo chown -R jenkins:users ." </span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo chown -R jenkins:users ."</span><br><span> sh "printenv | sort"</span><br><span> sh "sudo tests/CI/setupJenkinsEnvironment.sh"</span><br><span> }</span><br><span>@@ -93,7 +93,7 @@</span><br><span> }</span><br><span> </span><br><span> sh "sudo rm -rf ${groupDir} || : "</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> checkout scm: [$class: 'GitSCM',</span><br><span> branches: [[name: "${BRANCH_NAME}"]],</span><br><span> extensions: [</span><br><span>@@ -127,8 +127,7 @@</span><br><span> }</span><br><span> post {</span><br><span> cleanup {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo make distclean >/dev/null 2>&1 || : "</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "</span><br><span style="color: hsl(120, 100%, 40%);">+ cleanWs deleteDirs: true, notFailBuild: true</span><br><span> }</span><br><span> success {</span><br><span> echo "Reporting ${currentBuild.currentResult} Passed"</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index 3961cf5..c2467d7 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -181,8 +181,7 @@</span><br><span> }</span><br><span> post {</span><br><span> cleanup {</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo make distclean >/dev/null 2>&1 || : "</span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "</span><br><span style="color: hsl(120, 100%, 40%);">+ cleanWs deleteDirs: true, notFailBuild: true</span><br><span> }</span><br><span> /*</span><br><span> * The Gerrit Trigger will automatically post the "Verified" results back</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11595">change 11595</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/+/11595"/><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: I1cd3b73ebb045a987df0f62526d152a510210c39 </div>
<div style="display:none"> Gerrit-Change-Number: 11595 </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-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>