ci.jpl: Store per-config artifacts in just cfgs/ subdir
Instead of tf-m-ci-scripts/lava_artifacts/. "tf-m-ci-scripts" is clearly
supefluous and just an artifact of initial implementation. "lava_artifacts"
is also longer than really necessary, and misleading, because not all
artifacys are LAVA-related, e.g. code coverage reports (they are produced
based on the artifacts got from LAVA, but they're actually just generic
per-config artifacts).
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Idec984b2692551e1cd5b0a29a23eec075bd7101b
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 1353e8d..04f4909 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -553,11 +553,11 @@
all_jobs = submitJobsToList(results['lava_jobs'])
output = ""
if (all_jobs.size() > 0) {
- dir("tf-m-ci-scripts") {
+ dir(".") {
withCredentials([usernamePassword(credentialsId: env.LAVA_CREDENTIALS, passwordVariable: 'LAVA_TOKEN', usernameVariable: 'LAVA_USER')]) {
- output = sh(script: """./lava_helper/lava_wait_jobs.py --job-ids ${all_jobs.join(",")} \
+ output = sh(script: """./tf-m-ci-scripts/lava_helper/lava_wait_jobs.py --job-ids ${all_jobs.join(",")} \
--lava-url ${env.LAVA_URL} --lava-user ${LAVA_USER} --lava-token ${LAVA_TOKEN} \
- --artifacts-path lava_artifacts --lava-timeout 12000 \
+ --artifacts-path cfgs --lava-timeout 12000 \
""", returnStdout: true).trim()
showLinks(output)
archiveArtifacts artifacts: 'test_summary.*', allowEmptyArchive: true
@@ -585,7 +585,7 @@
print("ERROR: ${e}")
success = false
} finally {
- archiveArtifacts artifacts: 'tf-m-ci-scripts/lava_artifacts/**', allowEmptyArchive: true
+ archiveArtifacts artifacts: 'cfgs/**', allowEmptyArchive: true
if (all_jobs.size() > 0) {
emailNotification(success, 'test', filterFailedTest(output))
}