[TRTLLM-9707][infra] Support abort stage also upload results.xml to artifactory to support reuse test #10297
Conversation
|
/bot run |
📝 WalkthroughWalkthroughModified Jenkins pipeline test script to improve robustness during interruptions. Changes ensure partial test results are captured and uploaded before propagating interruption signals, while also strengthening error handling in result upload and cleanup operations. Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
jenkins/L0_Test.groovy
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Pre-commit Check
🔇 Additional comments (3)
jenkins/L0_Test.groovy (3)
200-206: Interruption info is lost when converted to failure.The
InterruptedExceptionis caught and converted torerunFailed = true, but the exception itself is not stored or propagated. This meanscacheErrorAndUploadResultwon't distinguish between an abort and a test failure - both will appear as failures.If preserving the abort semantics is important (e.g., for Jenkins to correctly report ABORTED status), consider storing the exception and re-throwing it after the loop completes:
Suggested alternative if abort status matters
def rerunFailed = false +def InterruptedException isolatedInterruptedException = null for (int i = 0; i < isolateTestLines.size(); i++) { // ... test execution ... } catch (InterruptedException e) { echo "Isolated test ${i} (${isolateTestName}) was interrupted. Stopping further isolated tests to allow result upload." - // Mark as failed and break instead of throwing immediately - // This allows cacheErrorAndUploadResult to collect partial results rerunFailed = true + isolatedInterruptedException = e break } } // After processing all isolated tests, set stage failure if any test failed if (rerunFailed) { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { error "One or more isolated tests failed after rerun attempts" } } + +// Re-throw interruption to let outer handler know it was an abort +if (isolatedInterruptedException != null) { + throw isolatedInterruptedException +} return rerunFailed
1468-1490: Good robustness improvements for result upload and cleanup.The changes correctly:
- Add
allowEmptyResults: truefor junit to handle interrupted tests with no results- Wrap cleanup in try/catch to avoid cascading failures
- Re-throw the captured interruption after upload to preserve correct pipeline state
2644-2648: LGTM - appropriate interruption handling.The exception is correctly re-thrown to let
cacheErrorAndUploadResulthandle the result upload, and the message clarifies that partial results may be available via the periodic junit path.
| } catch (InterruptedException e) { | ||
| echo "WARNING: finallyRunner was interrupted, but continuing with result upload to preserve partial test results" | ||
| // Don't re-throw - continue with upload | ||
| } catch (Exception finallyException) { | ||
| echo "WARNING: finallyRunner encountered an error, but continuing with result upload: ${finallyException.message}" | ||
| // Continue with XML generation and upload even if finallyRunner fails | ||
| } |
There was a problem hiding this comment.
InterruptedException from finallyRunner is swallowed and not re-thrown.
If taskRunner() succeeds but finallyRunner() is interrupted (user abort), the interruption is caught and logged but not stored. At line 1488-1490, interruptedException is still null, so the abort signal is silently lost and the pipeline continues as if nothing happened.
Consider capturing this interruption if no prior interruption exists:
Suggested fix
try {
finallyRunner()
} catch (InterruptedException e) {
echo "WARNING: finallyRunner was interrupted, but continuing with result upload to preserve partial test results"
- // Don't re-throw - continue with upload
+ // Capture the interruption to re-throw after upload if no prior interruption
+ if (interruptedException == null) {
+ interruptedException = e
+ }
} catch (Exception finallyException) {
echo "WARNING: finallyRunner encountered an error, but continuing with result upload: ${finallyException.message}"
// Continue with XML generation and upload even if finallyRunner fails
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| } catch (InterruptedException e) { | |
| echo "WARNING: finallyRunner was interrupted, but continuing with result upload to preserve partial test results" | |
| // Don't re-throw - continue with upload | |
| } catch (Exception finallyException) { | |
| echo "WARNING: finallyRunner encountered an error, but continuing with result upload: ${finallyException.message}" | |
| // Continue with XML generation and upload even if finallyRunner fails | |
| } | |
| } catch (InterruptedException e) { | |
| echo "WARNING: finallyRunner was interrupted, but continuing with result upload to preserve partial test results" | |
| // Capture the interruption to re-throw after upload if no prior interruption | |
| if (interruptedException == null) { | |
| interruptedException = e | |
| } | |
| } catch (Exception finallyException) { | |
| echo "WARNING: finallyRunner encountered an error, but continuing with result upload: ${finallyException.message}" | |
| // Continue with XML generation and upload even if finallyRunner fails | |
| } |
🤖 Prompt for AI Agents
In jenkins/L0_Test.groovy around lines 1437-1443, the catch for
InterruptedException currently logs and swallows the abort signal; update it to
preserve the interruption by assigning the caught InterruptedException to the
existing interruptedException variable if it is null (e.g., if no prior
interruption was recorded), keep the existing log, and continue to allow later
logic to observe and handle the stored interruption; leave the general Exception
catch as-is.
|
PR_Github #29942 [ run ] triggered by Bot. Commit: |
|
PR_Github #29942 [ run ] completed with state |
…rtifactory to support reuse test Signed-off-by: ZhanruiSunCh <184402041+ZhanruiSunCh@users.noreply.github.com>
ZhanruiSunCh
force-pushed
the
user/zhanruis/1225_support_upload_test_result_when_abort
branch
from
d91169e to
cb7cd83
Compare
|
/bot run |
|
PR_Github #30146 [ run ] triggered by Bot. Commit: |
|
/bot kill |
|
PR_Github #30158 [ kill ] triggered by Bot. Commit: |
|
PR_Github #30158 [ kill ] completed with state |
|
Blocked! |
3 participants
Summary by CodeRabbit
Release Notes
New Features
Bug Fixes
Chores
✏️ Tip: You can customize this high-level summary in your review settings.
Description
Test Coverage
PR Checklist
Please review the following before submitting your PR:
PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.
PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.
Test cases are provided for new code paths (see test instructions)
Any new dependencies have been scanned for license and vulnerabilities
CODEOWNERS updated if ownership changes
Documentation updated as needed
Update tava architecture diagram if there is a significant design change in PR.
The reviewers assigned automatically/manually are appropriate for the PR.
Please check this after reviewing the above items as appropriate for this PR.
GitHub Bot Help
/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...Provide a user friendly way for developers to interact with a Jenkins server.
Run
/bot [-h|--help]to print this help message.See details below for each supported subcommand.
Details
run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental)]Launch build/test pipelines. All previously running jobs will be killed.
--reuse-test (optional)pipeline-id(OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.--disable-reuse-test(OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.--disable-fail-fast(OPTIONAL) : Disable fail fast on build/tests/infra failures.--skip-test(OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.--stage-list "A10-PyTorch-1, xxx"(OPTIONAL) : Only run the specified test stages. Examples: "A10-PyTorch-1, xxx". Note: Does NOT update GitHub check status.--gpu-type "A30, H100_PCIe"(OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.--test-backend "pytorch, cpp"(OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.--only-multi-gpu-test(OPTIONAL) : Only run the multi-GPU tests. Note: Does NOT update GitHub check status.--disable-multi-gpu-test(OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.--add-multi-gpu-test(OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline.--post-merge(OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx"(OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".--detailed-log(OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.--debug(OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in thestage-listparameter to access the appropriate container environment. Note: Does NOT update GitHub check status.For guidance on mapping tests to stage names, see
docs/source/reference/ci-overview.mdand the
scripts/test_to_stage_mapping.pyhelper.kill
killKill all running builds associated with pull request.
skip
skip --comment COMMENTSkip testing for latest commit on pull request.
--comment "Reason for skipping build/test"is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.reuse-pipeline
reuse-pipelineReuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.