[Asterisk-code-review] CI: Fix log artifact paths (asterisk[certified/13.21])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/9421 )

Change subject: CI: Fix log artifact paths
......................................................................

CI: Fix log artifact paths

Change-Id: I55136de8f4d9c3b56bd4d054306a187bb04a4b7d
---
M tests/CI/gates.jenkinsfile
M tests/CI/runTestsuite.sh
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 9ce14ef..40c7916 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -132,6 +132,8 @@
 										sh 'sudo ./tests/CI/installAsterisk.sh'
 									}
 
+									sh "sudo rm -rf ${groupDir} || : "
+									
 									checkout scm: [$class: 'GitSCM',
 										branches: [[name: "${BRANCH_NAME}"]],
 											extensions: [
@@ -149,9 +151,9 @@
 									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 26b0934..a84a12c 100755
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -5,6 +5,9 @@
 
 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

-- 
To view, visit https://gerrit.asterisk.org/9421
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: certified/13.21
Gerrit-MessageType: merged
Gerrit-Change-Id: I55136de8f4d9c3b56bd4d054306a187bb04a4b7d
Gerrit-Change-Number: 9421
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180712/6221208c/attachment-0001.html>