mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Merge "CI: Split --test-command argument."
This commit is contained in:
		| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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 | ||||
| popd | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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}/**" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user