CI: Fix log artifact paths

Change-Id: I55136de8f4d9c3b56bd4d054306a187bb04a4b7d

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 9ce14ef2dae168530266dec0fc6dad488ed936d8..40c7916b39ab523e8cdb00839d88c5ad00c05800 100644 (file)
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -132,6 +132,8 @@ pipeline {
                                                                                sh 'sudo ./tests/CI/installAsterisk.sh'
                                                                        }
 
+                                                                       sh "sudo rm -rf ${groupDir} || : "
+                                                                       
                                                                        checkout scm: [$class: 'GitSCM',
                                                                                branches: [[name: "${BRANCH_NAME}"]],
                                                                                        extensions: [
@@ -149,9 +151,9 @@ pipeline {
                                                                        sh "tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"
 
                                                                        archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,
-                                                                               artifacts: "${groupDir}**"
+                                                                               artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"
 
-                                                                       junit testResults: "${groupDir}",
+                                                                       junit testResults: "${groupDir}/asterisk-test-suite-report.xml",
                                                                                healthScaleFactor: 1.0,
                                                                                keepLongStdio: true
                                                                }

diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh
index 26b09346bea4045040f814611d08e251014073e5..a84a12c9a2514b8eb7634ed5aaceec5c397bc086 100755 (executable)
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -5,6 +5,9 @@ ASTETCDIR=$DESTDIR/etc/asterisk
 
 pushd $TESTSUITE_DIR
 
+sudo ./cleanup-test-temnants.sh
+sudo chown -R jenkins:users .
+
 runner sudo PYTHONPATH=./lib/python/ ./runtests.py --cleanup ${TEST_COMMAND} || :
 
 if [ -f asterisk-test-suite-report.xml ]  ; then