<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9588">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Jenkins2: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Split --test-command argument.<br><br>The --test-command argument has now been split, unit tests now use<br>`--unittest-command` and the testsuite uses --testsuite-command.<br><br>This will make it easier to create a script which run everything by<br>forwarding the same arguments to all CI scripts.<br><br>Change-Id: Ia54aa4848eaffbdf13175fcda40fc0b23080ad71<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/runTestsuite.sh<br>M tests/CI/runUnittests.sh<br>M tests/CI/unittests.jenkinsfile<br>6 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 9dc7308..206e7f3 100644</span><br><span>--- a/tests/CI/gates.jenkinsfile</span><br><span>+++ b/tests/CI/gates.jenkinsfile</span><br><span>@@ -167,7 +167,7 @@</span><br><span> userRemoteConfigs: [[name: env.GERRIT_NAME, url: testsuiteUrl]]</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo tests/CI/runTestsuite.sh --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/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile</span><br><span>index 335edd9..a79c2d5 100644</span><br><span>--- a/tests/CI/periodics-daily.jenkinsfile</span><br><span>+++ b/tests/CI/periodics-daily.jenkinsfile</span><br><span>@@ -114,7 +114,7 @@</span><br><span> userRemoteConfigs: [[url: testsuiteUrl]]</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo tests/CI/runTestsuite.sh ${groupRunTestsuiteOptions} --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo tests/CI/runTestsuite.sh ${groupRunTestsuiteOptions} --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/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile</span><br><span>index d0c42ea..40bdd67 100644</span><br><span>--- a/tests/CI/ref_debug.jenkinsfile</span><br><span>+++ b/tests/CI/ref_debug.jenkinsfile</span><br><span>@@ -92,7 +92,7 @@</span><br><span> userRemoteConfigs: [[url: testsuiteUrl]]</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo tests/CI/runTestsuite.sh --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 4ca6369..a8908d4 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -13,8 +13,8 @@</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 ${TEST_COMMAND}"</span><br><span style="color: hsl(0, 100%, 40%);">-./runtests.py --cleanup ${TEST_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :</span><br><span style="color: hsl(120, 100%, 40%);">+echo "Running tests ${TESTSUITE_COMMAND}"</span><br><span style="color: hsl(120, 100%, 40%);">+./runtests.py --cleanup ${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> $CIDIR/teardownRealtime.sh</span><br><span>@@ -26,4 +26,4 @@</span><br><span> exit 1</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-popd</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+popd</span><br><span>diff --git a/tests/CI/runUnittests.sh b/tests/CI/runUnittests.sh</span><br><span>index c334ea6..1d2656b 100755</span><br><span>--- a/tests/CI/runUnittests.sh</span><br><span>+++ b/tests/CI/runUnittests.sh</span><br><span>@@ -60,7 +60,7 @@</span><br><span> $ASTERISK -rx "core waitfullybooted" -C $CONFFILE && break</span><br><span> done</span><br><span> sleep 1</span><br><span style="color: hsl(0, 100%, 40%);">-$ASTERISK -rx "${TEST_COMMAND:-test execute all}" -C $CONFFILE</span><br><span style="color: hsl(120, 100%, 40%);">+$ASTERISK -rx "${UNITTEST_COMMAND:-test execute all}" -C $CONFFILE</span><br><span> $ASTERISK -rx "test show results failed" -C $CONFFILE</span><br><span> $ASTERISK -rx "test generate results xml $OUTPUTFILE" -C $CONFFILE</span><br><span> $ASTERISK -rx "core stop now" -C $CONFFILE</span><br><span>diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile</span><br><span>index 767ff94..c1c01c1 100644</span><br><span>--- a/tests/CI/unittests.jenkinsfile</span><br><span>+++ b/tests/CI/unittests.jenkinsfile</span><br><span>@@ -136,7 +136,7 @@</span><br><span> </span><br><span> sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --test-command='${testcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --unittest-command='${testcmd}'"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,</span><br><span> artifacts: "${outputdir}/**"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9588">change 9588</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/9588"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia54aa4848eaffbdf13175fcda40fc0b23080ad71 </div>
<div style="display:none"> Gerrit-Change-Number: 9588 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>