CI: Split --test-command argument.

The --test-command argument has now been split, unit tests now use
`--unittest-command` and the testsuite uses --testsuite-command.

This will make it easier to create a script which run everything by
forwarding the same arguments to all CI scripts.

Change-Id: Ia54aa4848eaffbdf13175fcda40fc0b23080ad71

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 9dc7308bece6ace051ce3ef09002cbeeac416d72..206e7f3cede118a2fd8d2b3f7c3468c613d5d2ef 100644 (file)
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -167,7 +167,7 @@ pipeline {
                                                                                        userRemoteConfigs: [[name: env.GERRIT_NAME, url: testsuiteUrl]]
                                                                                ]
 
-                                                                       sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"
+                                                                       sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --testsuite-command='${groupTestcmd}'"
 
                                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,
                                                                                artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"

diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile
index 335edd99753b54c57960d68a016824d630c1fffc..a79c2d5170719ecce4d8eb0104f2bc45e08870aa 100644 (file)
--- a/tests/CI/periodics-daily.jenkinsfile
+++ b/tests/CI/periodics-daily.jenkinsfile
@@ -114,7 +114,7 @@ pipeline {
                                                                                        userRemoteConfigs: [[url: testsuiteUrl]]
                                                                                ]
 
-                                                                       sh "sudo tests/CI/runTestsuite.sh ${groupRunTestsuiteOptions} --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"
+                                                                       sh "sudo tests/CI/runTestsuite.sh ${groupRunTestsuiteOptions} --testsuite-dir='${groupDir}' --testsuite-command='${groupTestcmd}'"
 
                                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,
                                                                                artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"

diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile
index d0c42eab4d59d388916d4d2e113d528fb523f1ad..40bdd67ab3e8723e8592bbe772a100d75c55ba4c 100644 (file)
--- a/tests/CI/ref_debug.jenkinsfile
+++ b/tests/CI/ref_debug.jenkinsfile
@@ -92,7 +92,7 @@ pipeline {
                                                                                        userRemoteConfigs: [[url: testsuiteUrl]]
                                                                                ]
 
-                                                                       sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"
+                                                                       sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --testsuite-command='${groupTestcmd}'"
 
                                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,
                                                                                artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"

diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh
index 4ca63691f237b909381ee5d817565121e0c4cacc..a8908d4f0f7e543e13a800b50de67192d35ef808 100755 (executable)
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -13,8 +13,8 @@ if [ $REALTIME -eq 1 ] ; then
 fi
 
 export PYTHONPATH=./lib/python/
-echo "Running tests ${TEST_COMMAND}"
-./runtests.py --cleanup ${TEST_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :
+echo "Running tests ${TESTSUITE_COMMAND}"
+./runtests.py --cleanup ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :
 
 if [ $REALTIME -eq 1 ] ; then
        $CIDIR/teardownRealtime.sh
@@ -26,4 +26,4 @@ if [ -f core* ] ; then
        exit 1
 fi
 
-popd
\ No newline at end of file
+popd

diff --git a/tests/CI/runUnittests.sh b/tests/CI/runUnittests.sh
index c334ea64b2e59ff73b1759c8a2b796d687264603..1d2656b1763aae812acc6d814b0de083e37bc2eb 100755 (executable)
--- a/tests/CI/runUnittests.sh
+++ b/tests/CI/runUnittests.sh
@@ -60,7 +60,7 @@ for n in `seq 1 5` ; do
        $ASTERISK -rx "core waitfullybooted" -C $CONFFILE && break
 done
 sleep 1
-$ASTERISK -rx "${TEST_COMMAND:-test execute all}" -C $CONFFILE
+$ASTERISK -rx "${UNITTEST_COMMAND:-test execute all}" -C $CONFFILE
 $ASTERISK -rx "test show results failed" -C $CONFFILE
 $ASTERISK -rx "test generate results xml $OUTPUTFILE" -C $CONFFILE
 $ASTERISK -rx "core stop now" -C $CONFFILE

diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 767ff9447c65bacfbc7bea0768bcee30f236fc45..c1c01c1cb96c07026d597d928211e899a17b1154 100644 (file)
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -136,7 +136,7 @@ pipeline {
 
                                                        sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'
 
-                                                       sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --test-command='${testcmd}'"
+                                                       sh "tests/CI/runUnittests.sh --user-group=jenkins:users --output-dir='${outputdir}' --output-xml='${outputfile}' --unittest-command='${testcmd}'"
 
                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,
                                                                artifacts: "${outputdir}/**"