<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10676">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:  Pass work directory to runTestsuite<br><br>The testsuite can now use a user-specified work directory for<br>all it's temp files.  This allows the docker containers to use<br>a tmpfs backed directory for the temp files instead of it's<br>own write-layer image.<br><br>* runTestsuite.sh now accepts a --work-dir command line argument<br>  that gets exported as AST_WORK_DIR before running the testsuite.<br><br>* gates.jenkinsfile now specifies --work-dir to be<br>  <testsuite_dir>/astroot.<br><br>Since the Asterisk CI docker hosts now mount /srv/jenkins/workspace<br>on a tmpfs, asterisk should be compiled and the testsuite run all in<br>memory.<br><br>Change-Id: If5ee905a15821296c355bb84cda38950ad8edc45<br>(cherry picked from commit a335f4c9adb0a00211345634f61917bdf5b412c2)<br>---<br>M tests/CI/gates.jenkinsfile<br>M tests/CI/runTestsuite.sh<br>2 files changed, 7 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 9835647..7be5768 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -197,7 +197,7 @@</span><br><span>                                                                              ]</span><br><span>                                                                    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                                                                   sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --testsuite-command='${groupTestcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                      sh "sudo tests/CI/runTestsuite.sh --work-dir='${groupDir}/astroot' --testsuite-dir='${groupDir}' --testsuite-command='${groupTestcmd}'"</span><br><span> </span><br><span>                                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,</span><br><span>                                                                                 artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"</span><br><span>diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh</span><br><span>index 9ee7718..466991a 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -5,6 +5,11 @@</span><br><span> source $CIDIR/ci.functions</span><br><span> ASTETCDIR=$DESTDIR/etc/asterisk</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if [ x"$WORK_DIR" != x ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ export AST_WORK_DIR="$(readlink -f $WORK_DIR)"</span><br><span style="color: hsl(120, 100%, 40%);">+      mkdir -p "$AST_WORK_DIR"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pushd $TESTSUITE_DIR</span><br><span> </span><br><span> ./cleanup-test-remnants.sh</span><br><span>@@ -14,7 +19,7 @@</span><br><span> fi</span><br><span> </span><br><span> export PYTHONPATH=./lib/python/</span><br><span style="color: hsl(0, 100%, 40%);">-echo "Running tests ${TESTSUITE_COMMAND}"</span><br><span style="color: hsl(120, 100%, 40%);">+echo "Running tests ${TESTSUITE_COMMAND} ${AST_WORK_DIR:+with work directory ${AST_WORK_DIR}}"</span><br><span> ./runtests.py --cleanup --timeout=${TEST_TIMEOUT} ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :</span><br><span> </span><br><span> if [ $REALTIME -eq 1 ] ; then</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10676">change 10676</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/10676"/><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: If5ee905a15821296c355bb84cda38950ad8edc45 </div>
<div style="display:none"> Gerrit-Change-Number: 10676 </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 (1000185) </div>