Fixed Combining all logs in a single folder per test suite for voltha-2.8 bbsim jobs
Change-Id: Ibf51f45299faa36c8d7bc6b0bbcb697cb26a2d68
diff --git a/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
index c4e9490..24b2d82 100755
--- a/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
@@ -109,14 +109,14 @@
}
stage('Run test ' + testTarget + ' on ' + workflow + ' workFlow') {
sh """
- mkdir -p $WORKSPACE/${robotLogsDir}/${testTarget}-robot
- export ROBOT_MISC_ARGS="-d $WORKSPACE/${robotLogsDir}/${testTarget}-robot "
- ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:$WORKSPACE/${robotLogsDir}/${testTarget}-robot -v logging:${testLogging}"
+ mkdir -p ${logsDir}
+ export ROBOT_MISC_ARGS="-d ${logsDir} "
+ ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
export KVSTOREPREFIX=voltha/voltha_voltha
make -C $WORKSPACE/voltha-system-tests ${testTarget} || true
"""
- getPodsInfo("$WORKSPACE/${testTarget}-components")
+ getPodsInfo("${logsDir}")
}
}
@@ -134,12 +134,12 @@
'''
step([$class: 'RobotPublisher',
disableArchiveOutput: false,
- logFileName: "RobotLogs/*/log*.html",
+ logFileName: "**/*/log*.html",
otherFiles: '',
- outputFileName: "RobotLogs/*/output*.xml",
+ outputFileName: "**/*/output*.xml",
outputPath: '.',
passThreshold: 100,
- reportFileName: "RobotLogs/*/report*.html",
+ reportFileName: "**/*/report*.html",
unstableThreshold: 0,
onlyCritical: true]);
}