CI: Add --test-timeout option to runTestsuite.sh

The default is 600 seconds.
Also added timeouts to the *TestGroups.json files.

Change-Id: I8ab6a69e704b6a10f06a0e52ede02312a2b72fe0

diff --git a/tests/CI/gateTestGroups.json b/tests/CI/gateTestGroups.json
index 7c8b917fd7adde9fa59c16ca7b9e8837c6139cd9..d0488962ba39082f554cfe0be5c839c06d753961 100644 (file)
--- a/tests/CI/gateTestGroups.json
+++ b/tests/CI/gateTestGroups.json
@@ -2,46 +2,55 @@
        {
                "name": "ari1",
                "dir": "tests/CI/output/ari1",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/rest_api/[Ca-d]"
        },
        {
                "name": "ari2",
                "dir": "tests/CI/output/ari2",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/rest_api/[e-z]"
        },
        {
                "name": "pjs1",
                "dir": "tests/CI/output/pjsip1",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/channels/pjsip/[a-f]"
        },
        {
                "name": "pjs2",
                "dir": "tests/CI/output/pjsip2",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/channels/pjsip/[g-r]"
        },
        {
                "name": "pjs3",
                "dir": "tests/CI/output/pjsip3",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/channels/pjsip/[s-z]"
        },
        {
                "name": "sip1",
                "dir": "tests/CI/output/sip1",
+               "runTestsuiteOptions": "--test-timeout=240",
                "testcmd": "--test-regex=tests/channels/SIP/[Sa-r]"
        },
        {
                "name": "sip2",
                "dir": "tests/CI/output/sip2",
+               "runTestsuiteOptions": "--test-timeout=240",
                "testcmd": "--test-regex=tests/channels/SIP/[s-z]"
        },
        {
                "name": "iax ",
                "dir": "tests/CI/output/iax2_local",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": " -t tests/channels/iax2 -t tests/channels/local"
        },
        {
                "name": "mwi ",
                "dir": "tests/CI/output/extmwi",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "--test-regex=tests/channels/pjsip/.*mwi"
        }
 ]

diff --git a/tests/CI/periodic-dailyTestGroups.json b/tests/CI/periodic-dailyTestGroups.json
index 913603283fcab33fab88cd288cd9054616329ead..7f0fd7ecfa5f583a73af74eaa99c5b65472e19f1 100644 (file)
--- a/tests/CI/periodic-dailyTestGroups.json
+++ b/tests/CI/periodic-dailyTestGroups.json
@@ -2,37 +2,43 @@
        {
                "name": "ari ",
                "dir": "tests/CI/output/ari",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "-t tests/rest_api/"
        },
        {
                "name": "pjs ",
                "dir": "tests/CI/output/pjsip",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": "-t tests/channels/pjsip"
        },
        {
                "name": "sip ",
                "dir": "tests/CI/output/sip",
+               "runTestsuiteOptions": "--test-timeout=240",
                "testcmd": "-t tests/channels/SIP"
        },
        {
                "name": "iax ",
                "dir": "tests/CI/output/iax2_local",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": " -t tests/channels/iax2 -t tests/channels/local"
        },
        {
                "name": "apps",
                "dir": "tests/CI/output/agi-apps",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": " -t tests/agi -t tests/apps -t blind-transfer-parkingtimeout"
        },
        {
                "name": "othr",
                "dir": "tests/CI/output/other",
+               "runTestsuiteOptions": "--test-timeout=180",
                "testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)"
        },
        {
                "name": "real",
                "dir": "tests/CI/output/realtime",
-               "runTestsuiteOptions": "--realtime --initialize-db --cleanup-db",
+               "runTestsuiteOptions": "--test-timeout=180 --realtime --initialize-db --cleanup-db",
                "testcmd": " -t tests/channels/pjsip -G realtime-incompatible"
        }
 ]

diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh
index 0778a2ba6d42021b577fcee4e623dc9f55e5d28c..9ee7718338a8cc6009086477aca57443d349338c 100755 (executable)
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 CIDIR=$(dirname $(readlink -fn $0))
 REALTIME=0
+TEST_TIMEOUT=600
 source $CIDIR/ci.functions
 ASTETCDIR=$DESTDIR/etc/asterisk
 
@@ -14,7 +15,7 @@ fi
 
 export PYTHONPATH=./lib/python/
 echo "Running tests ${TESTSUITE_COMMAND}"
-./runtests.py --cleanup ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :
+./runtests.py --cleanup --timeout=${TEST_TIMEOUT} ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :
 
 if [ $REALTIME -eq 1 ] ; then
        $CIDIR/teardownRealtime.sh --cleanup-db=${CLEANUP_DB:?0}