<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10279">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Add --test-timeout option to runTestsuite.sh<br><br>The default is 600 seconds.<br>Also added timeouts to the *TestGroups.json files.<br><br>Change-Id: I8ab6a69e704b6a10f06a0e52ede02312a2b72fe0<br>---<br>M tests/CI/gateTestGroups.json<br>M tests/CI/periodic-dailyTestGroups.json<br>M tests/CI/runTestsuite.sh<br>3 files changed, 18 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/CI/gateTestGroups.json b/tests/CI/gateTestGroups.json</span><br><span>index 7c8b917..d048896 100644</span><br><span>--- a/tests/CI/gateTestGroups.json</span><br><span>+++ b/tests/CI/gateTestGroups.json</span><br><span>@@ -2,46 +2,55 @@</span><br><span> {</span><br><span> "name": "ari1",</span><br><span> "dir": "tests/CI/output/ari1",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/rest_api/[Ca-d]"</span><br><span> },</span><br><span> {</span><br><span> "name": "ari2",</span><br><span> "dir": "tests/CI/output/ari2",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/rest_api/[e-z]"</span><br><span> },</span><br><span> {</span><br><span> "name": "pjs1",</span><br><span> "dir": "tests/CI/output/pjsip1",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/channels/pjsip/[a-f]"</span><br><span> },</span><br><span> {</span><br><span> "name": "pjs2",</span><br><span> "dir": "tests/CI/output/pjsip2",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/channels/pjsip/[g-r]"</span><br><span> },</span><br><span> {</span><br><span> "name": "pjs3",</span><br><span> "dir": "tests/CI/output/pjsip3",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/channels/pjsip/[s-z]"</span><br><span> },</span><br><span> {</span><br><span> "name": "sip1",</span><br><span> "dir": "tests/CI/output/sip1",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=240",</span><br><span> "testcmd": "--test-regex=tests/channels/SIP/[Sa-r]"</span><br><span> },</span><br><span> {</span><br><span> "name": "sip2",</span><br><span> "dir": "tests/CI/output/sip2",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=240",</span><br><span> "testcmd": "--test-regex=tests/channels/SIP/[s-z]"</span><br><span> },</span><br><span> {</span><br><span> "name": "iax ",</span><br><span> "dir": "tests/CI/output/iax2_local",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": " -t tests/channels/iax2 -t tests/channels/local"</span><br><span> },</span><br><span> {</span><br><span> "name": "mwi ",</span><br><span> "dir": "tests/CI/output/extmwi",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "--test-regex=tests/channels/pjsip/.*mwi"</span><br><span> }</span><br><span> ]</span><br><span>diff --git a/tests/CI/periodic-dailyTestGroups.json b/tests/CI/periodic-dailyTestGroups.json</span><br><span>index 9136032..7f0fd7e 100644</span><br><span>--- a/tests/CI/periodic-dailyTestGroups.json</span><br><span>+++ b/tests/CI/periodic-dailyTestGroups.json</span><br><span>@@ -2,37 +2,43 @@</span><br><span> {</span><br><span> "name": "ari ",</span><br><span> "dir": "tests/CI/output/ari",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "-t tests/rest_api/"</span><br><span> },</span><br><span> {</span><br><span> "name": "pjs ",</span><br><span> "dir": "tests/CI/output/pjsip",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": "-t tests/channels/pjsip"</span><br><span> },</span><br><span> {</span><br><span> "name": "sip ",</span><br><span> "dir": "tests/CI/output/sip",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=240",</span><br><span> "testcmd": "-t tests/channels/SIP"</span><br><span> },</span><br><span> {</span><br><span> "name": "iax ",</span><br><span> "dir": "tests/CI/output/iax2_local",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": " -t tests/channels/iax2 -t tests/channels/local"</span><br><span> },</span><br><span> {</span><br><span> "name": "apps",</span><br><span> "dir": "tests/CI/output/agi-apps",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": " -t tests/agi -t tests/apps -t blind-transfer-parkingtimeout"</span><br><span> },</span><br><span> {</span><br><span> "name": "othr",</span><br><span> "dir": "tests/CI/output/other",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180",</span><br><span> "testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)"</span><br><span> },</span><br><span> {</span><br><span> "name": "real",</span><br><span> "dir": "tests/CI/output/realtime",</span><br><span style="color: hsl(0, 100%, 40%);">- "runTestsuiteOptions": "--realtime --initialize-db --cleanup-db",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--test-timeout=180 --realtime --initialize-db --cleanup-db",</span><br><span> "testcmd": " -t tests/channels/pjsip -G realtime-incompatible"</span><br><span> }</span><br><span> ]</span><br><span>diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh</span><br><span>index 0778a2b..9ee7718 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -1,6 +1,7 @@</span><br><span> #!/usr/bin/env bash</span><br><span> CIDIR=$(dirname $(readlink -fn $0))</span><br><span> REALTIME=0</span><br><span style="color: hsl(120, 100%, 40%);">+TEST_TIMEOUT=600</span><br><span> source $CIDIR/ci.functions</span><br><span> ASTETCDIR=$DESTDIR/etc/asterisk</span><br><span> </span><br><span>@@ -14,7 +15,7 @@</span><br><span> </span><br><span> export PYTHONPATH=./lib/python/</span><br><span> echo "Running tests ${TESTSUITE_COMMAND}"</span><br><span style="color: hsl(0, 100%, 40%);">-./runtests.py --cleanup ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :</span><br><span style="color: hsl(120, 100%, 40%);">+./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> $CIDIR/teardownRealtime.sh --cleanup-db=${CLEANUP_DB:?0}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10279">change 10279</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/10279"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15.6 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8ab6a69e704b6a10f06a0e52ede02312a2b72fe0 </div>
<div style="display:none"> Gerrit-Change-Number: 10279 </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: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>