[TRTLLMINF-40][chore] Dedupe COMMON_SSH_OPTIONS to reference bloom's DEFAULT_CUSTOM_SSH_OPTIONS - #17706
[TRTLLMINF-40][chore] Dedupe COMMON_SSH_OPTIONS to reference bloom's DEFAULT_CUSTOM_SSH_OPTIONS#17706brnguyen2 wants to merge 2 commits into
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughThe PR uses the shared SSH options constant in Jenkins and adds a waiver for a GLM 5.2 NVFP4 NIXL integration test. ChangesTest Configuration Updates
Estimated code review effort: 1 (Trivial) | ~2 minutes Merge Risk: ⚪ Minimal · up to This change centralizes the SSH options and adds a bounded 15-second connection timeout to the affected CI transfers; no actionable merge-blocking risk remains. Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches 💡 1🛠️ Fix failing CI checks 💡
🧪 Generate unit tests (beta)
Comment |
|
/bot run |
|
PR_Github #66282 [ run ] triggered by Bot. Commit: |
|
PR_Github #66282 [ run ] completed with state
|
|
/bot run |
|
PR_Github #66351 [ run ] triggered by Bot. Commit: |
|
PR_Github #66351 [ run ] completed with state
|
|
/bot run |
|
PR_Github #66372 [ run ] triggered by Bot. Commit: |
|
PR_Github #66372 [ run ] completed with state
|
|
/bot run |
|
PR_Github #66403 [ run ] triggered by Bot. Commit: |
|
PR_Github #66403 [ run ] completed with state
|
|
/bot run |
|
PR_Github #66405 [ run ] triggered by Bot. Commit: |
|
PR_Github #66405 [ run ] completed with state
|
|
/bot run |
…DEFAULT_CUSTOM_SSH_OPTIONS Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
…FP4::test_nvfp4_nixl[cache_mgr_v1] (pre-existing failure, tracking bug pending) Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
|
/bot run |
2462730 to
1984a29
Compare
|
PR_Github #66426 [ run ] triggered by Bot. Commit: |
|
PR_Github #66426 [ run ] completed with state
|
Summary
jenkins/L0_Test.groovydefinedCOMMON_SSH_OPTIONSas a string literal that duplicatedcom.nvidia.bloom.Utils.DEFAULT_CUSTOM_SSH_OPTIONSin the bloom Jenkins shared library. This replaces the literal with a reference to the canonical constant:Utils(com.nvidia.bloom.Utils) is already imported (line 28), so no new import is added. All existing call sites that interpolate${COMMON_SSH_OPTIONS}are unchanged.Motivation
The two definitions had already drifted: bloom's
DEFAULT_CUSTOM_SSH_OPTIONSgained-o ConnectTimeout=15(from[TRTLLMINF-99], to stop SLURM frontend probes hanging), while this local literal still had no connect timeout. Referencing the canonical constant gives a single source of truth so the options can't diverge again.Effect (not a no-op)
Because bloom's constant now carries
ConnectTimeout=15, this dedupe adds a 15s connect timeout to the ssh/scp calls that useCOMMON_SSH_OPTIONSinL0_Test.groovy(the result-download scp and the debug-VM ssh), bounding hung connects instead of relying on the OS default. This is safe:numRetries: 3, so a bounded-then-retried connect is strictly better than an unbounded hang.COMMON_SSH_OPTIONShere is independent of bloom's SLURM-frontend-probe path (that path uses bloom's constant directly and has its own 30s backstop), so there is no interaction with the TRTLLMINF-99 probe invariant.The other options (
StrictHostKeyChecking,UserKnownHostsFile,TCPKeepAlive,ServerAliveInterval,ServerAliveCountMax) are unchanged.Dev Engineer Review
jenkins/L0_Test.groovyto useUtils.DEFAULT_CUSTOM_SSH_OPTIONS.TestGLM52NVFP4::test_nvfp4_nixl[cache_mgr_v1].QA Engineer Review
tests/integration/test_lists/waives.txt.test-db/orqa/files were modified.pr-babysitter waive set-bug NVIDIA/TensorRT-LLM#17706 <bug-url>— the waives entry carries a placeholder until then