Skip to content

Commit 6b35afa

Browse files
yiqingy0chzblych
andauthored
[Infra][TRTLLM-6013] - Fix stage name in single stage test rerun report (NVIDIA#5672)
Signed-off-by: Yiqing Yan <[email protected]> Co-authored-by: Yanchao Lu <[email protected]>
1 parent 01b2def commit 6b35afa

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

jenkins/L0_MergeRequest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ def collectTestResults(pipeline, testFilter)
771771
trtllm_utils.llmExecStepWithRetry(pipeline, script: "apk add py3-pip")
772772
trtllm_utils.llmExecStepWithRetry(pipeline, script: "pip3 config set global.break-system-packages true")
773773
sh """
774-
python3 llm/tests/integration/defs/test_rerun.py \
774+
python3 llm/jenkins/test_rerun.py \
775775
generate_rerun_report \
776776
--output-file=rerun/rerun_report.xml \
777777
--input-files=${inputfiles}

jenkins/L0_Test.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ def rerunFailedTests(stageName, llmSrc, testCmdLine) {
11111111
// Generate rerun test lists
11121112
def failSignaturesList = trtllm_utils.getFailSignaturesList().join(",")
11131113
sh """
1114-
python3 ${llmSrc}/tests/integration/defs/test_rerun.py \
1114+
python3 ${llmSrc}/jenkins/test_rerun.py \
11151115
generate_rerun_tests_list \
11161116
--output-dir=${WORKSPACE}/${stageName}/ \
11171117
--input-file=${WORKSPACE}/${stageName}/results.xml \
@@ -1184,20 +1184,23 @@ def rerunFailedTests(stageName, llmSrc, testCmdLine) {
11841184
}
11851185
}
11861186

1187-
// generate rerun report
1187+
// Specify the stage name correctly
1188+
sh "cd ${WORKSPACE}/${stageName} && sed -i 's/testsuite name=\"pytest\"/testsuite name=\"${stageName}\"/g' *.xml || true"
1189+
1190+
// Generate rerun report
11881191
inputFiles = ["${WORKSPACE}/${stageName}/results.xml",
11891192
"${WORKSPACE}/${stageName}/rerun_results_1.xml",
11901193
"${WORKSPACE}/${stageName}/rerun_results_2.xml"]
11911194
sh """
1192-
python3 ${llmSrc}/tests/integration/defs/test_rerun.py \
1195+
python3 ${llmSrc}/jenkins/test_rerun.py \
11931196
generate_rerun_report \
11941197
--output-file=${WORKSPACE}/${stageName}/rerun_results.xml \
11951198
--input-files=${inputFiles.join(",")}
11961199
"""
11971200

11981201
// Update original results xml file with rerun results xml files for junit
11991202
sh """
1200-
python3 ${llmSrc}/tests/integration/defs/test_rerun.py \
1203+
python3 ${llmSrc}/jenkins/test_rerun.py \
12011204
merge_junit_xmls \
12021205
--output-file=${WORKSPACE}/${stageName}/results.xml \
12031206
--input-files=${inputFiles.join(",")} \

0 commit comments

Comments
 (0)